From patchwork Mon May 17 13:17:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joakim Tjernlund X-Patchwork-Id: 100117 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4HDHQH7003847 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 17 May 2010 13:18:02 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OE0CB-0004ps-8i; Mon, 17 May 2010 13:17:23 +0000 Received: from sfi-mx-4.v28.ch3.sourceforge.com ([172.29.28.124] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OE0CA-0004pm-L0 for spi-devel-general@lists.sourceforge.net; Mon, 17 May 2010 13:17:22 +0000 Received-SPF: pass (sfi-mx-4.v28.ch3.sourceforge.com: domain of transmode.com designates 213.115.205.20 as permitted sender) client-ip=213.115.205.20; envelope-from=joakim.tjernlund@transmode.com; helo=gw1.transmode.se; Received: from gw1.transmode.se ([213.115.205.20]) by sfi-mx-4.v28.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.69) id 1OE0C7-0002kk-7s for spi-devel-general@lists.sourceforge.net; Mon, 17 May 2010 13:17:22 +0000 Received: from sesr04.transmode.se (sesr04.transmode.se [192.168.201.15]) by gw1.transmode.se (Postfix) with ESMTP id 1CFD6650002; Mon, 17 May 2010 15:17:12 +0200 (CEST) Received: from gentoo-jocke.transmode.se ([192.168.1.15]) by sesr04.transmode.se (Lotus Domino Release 8.5.1) with ESMTP id 2010051715171209-35192 ; Mon, 17 May 2010 15:17:12 +0200 Received: from gentoo-jocke.transmode.se (gentoo-jocke.transmode.se [127.0.0.1]) by gentoo-jocke.transmode.se (8.14.4/8.14.0) with ESMTP id o4HDHBY3020865; Mon, 17 May 2010 15:17:11 +0200 Received: (from jocke@localhost) by gentoo-jocke.transmode.se (8.14.4/8.14.4/Submit) id o4HDHBqj020864; Mon, 17 May 2010 15:17:11 +0200 From: Joakim Tjernlund To: Anton Vorontsov , spi-devel-general@lists.sourceforge.net Date: Mon, 17 May 2010 15:17:10 +0200 Message-Id: <1274102230-20828-1-git-send-email-Joakim.Tjernlund@transmode.se> X-Mailer: git-send-email 1.6.4.4 X-MIMETrack: Itemize by SMTP Server on sesr04/Transmode(Release 8.5.1|September 28, 2009) at 2010-05-17 15:17:12, Serialize by Router on sesr04/Transmode(Release 8.5.1|September 28, 2009) at 2010-05-17 15:17:12, Serialize complete at 2010-05-17 15:17:12 X-Spam-Score: -1.0 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record 0.5 AWL AWL: From: address is in the auto white-list X-Headers-End: 1OE0C7-0002kk-7s Cc: Joakim Tjernlund Subject: [spi-devel-general] [PATCH] spi: spi_mpc8xxx.c: Do not use map_tx_dma to unmap rx_dma X-BeenThere: spi-devel-general@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux SPI core/device drivers discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: spi-devel-general-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 17 May 2010 13:18:02 +0000 (UTC) diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c index c85dbbb..2d54020 100644 --- a/drivers/spi/spi_mpc8xxx.c +++ b/drivers/spi/spi_mpc8xxx.c @@ -514,7 +514,7 @@ static void mpc8xxx_spi_cpm_bufs_complete(struct mpc8xxx_spi *mspi) if (mspi->map_tx_dma) dma_unmap_single(dev, mspi->tx_dma, t->len, DMA_TO_DEVICE); - if (mspi->map_tx_dma) + if (mspi->map_rx_dma) dma_unmap_single(dev, mspi->rx_dma, t->len, DMA_FROM_DEVICE); mspi->xfer_in_progress = NULL; }