linux-spi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] spi: spi_mpc8xxx.c: Do not use map_tx_dma to unmap rx_dma
@ 2010-05-17 13:17 Joakim Tjernlund
       [not found] ` <1274102230-20828-1-git-send-email-Joakim.Tjernlund-SNLAxHN9vbcOP4wsBPIw7w@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: Joakim Tjernlund @ 2010-05-17 13:17 UTC (permalink / raw)
  To: Anton Vorontsov,
	spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f
  Cc: Joakim Tjernlund

This fixes a typo were map_tx_dma is used instead of
map_rx_dma, casing the driver to unmap rx_dma when it
shouldn't.

Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund-SNLAxHN9vbcOP4wsBPIw7w@public.gmane.org>
---
 drivers/spi/spi_mpc8xxx.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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;
 }
-- 
1.6.4.4


------------------------------------------------------------------------------

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] spi: spi_mpc8xxx.c: Do not use map_tx_dma to unmap rx_dma
       [not found] ` <1274102230-20828-1-git-send-email-Joakim.Tjernlund-SNLAxHN9vbcOP4wsBPIw7w@public.gmane.org>
@ 2010-05-17 13:22   ` Anton Vorontsov
       [not found]     ` <20100517132254.GA6567-wnGakbxT3iijyJ0x5qLZdcN33GVbZNy3@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: Anton Vorontsov @ 2010-05-17 13:22 UTC (permalink / raw)
  To: Joakim Tjernlund; +Cc: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f

On Mon, May 17, 2010 at 03:17:10PM +0200, Joakim Tjernlund wrote:
> This fixes a typo were map_tx_dma is used instead of
> map_rx_dma, casing the driver to unmap rx_dma when it
> shouldn't.
> 
> Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund-SNLAxHN9vbcOP4wsBPIw7w@public.gmane.org>

Acked-by: Anton Vorontsov <cbouatmailru-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

Thanks!

> ---
>  drivers/spi/spi_mpc8xxx.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> 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;
>  }
> -- 
> 1.6.4.4

-- 
Anton Vorontsov
email: cbouatmailru-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org
irc://irc.freenode.net/bd2

------------------------------------------------------------------------------

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] spi: spi_mpc8xxx.c: Do not use map_tx_dma to unmap rx_dma
       [not found]     ` <20100517132254.GA6567-wnGakbxT3iijyJ0x5qLZdcN33GVbZNy3@public.gmane.org>
@ 2010-05-21 17:23       ` Joakim Tjernlund
       [not found]         ` <OFD8B30A94.BD9EA490-ONC125772A.005F631A-C125772A.005F8E73-SNLAxHN9vbcOP4wsBPIw7w@public.gmane.org>
  0 siblings, 1 reply; 4+ messages in thread
From: Joakim Tjernlund @ 2010-05-21 17:23 UTC (permalink / raw)
  To: grant.likely-s3s/WqlpOiPyB63q8FvJNQ
  Cc: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f

Anton Vorontsov <cbouatmailru-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote on 2010/05/17 15:22:54:
>
> On Mon, May 17, 2010 at 03:17:10PM +0200, Joakim Tjernlund wrote:
> > This fixes a typo were map_tx_dma is used instead of
> > map_rx_dma, casing the driver to unmap rx_dma when it
> > shouldn't.
> >
> > Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund-SNLAxHN9vbcOP4wsBPIw7w@public.gmane.org>
>
> Acked-by: Anton Vorontsov <cbouatmailru-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>
> Thanks!

Hi Grant

I havn't seen any activity towards getting my patches into Linus tree, forgotten?


------------------------------------------------------------------------------

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] spi: spi_mpc8xxx.c: Do not use map_tx_dma to unmap rx_dma
       [not found]         ` <OFD8B30A94.BD9EA490-ONC125772A.005F631A-C125772A.005F8E73-SNLAxHN9vbcOP4wsBPIw7w@public.gmane.org>
@ 2010-05-22  5:54           ` Grant Likely
  0 siblings, 0 replies; 4+ messages in thread
From: Grant Likely @ 2010-05-22  5:54 UTC (permalink / raw)
  To: Joakim Tjernlund; +Cc: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f

On Fri, May 21, 2010 at 11:23 AM, Joakim Tjernlund
<joakim.tjernlund-SNLAxHN9vbcOP4wsBPIw7w@public.gmane.org> wrote:
> Anton Vorontsov <cbouatmailru-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote on 2010/05/17 15:22:54:
>>
>> On Mon, May 17, 2010 at 03:17:10PM +0200, Joakim Tjernlund wrote:
>> > This fixes a typo were map_tx_dma is used instead of
>> > map_rx_dma, casing the driver to unmap rx_dma when it
>> > shouldn't.
>> >
>> > Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund-SNLAxHN9vbcOP4wsBPIw7w@public.gmane.org>
>>
>> Acked-by: Anton Vorontsov <cbouatmailru-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>>
>> Thanks!
>
> Hi Grant
>
> I havn't seen any activity towards getting my patches into Linus tree, forgotten?

Not forgotten.  Just digging myself out from under the backlog due to
travel.  I'm getting it sorted out now.

g.

------------------------------------------------------------------------------

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2010-05-22  5:54 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-17 13:17 [PATCH] spi: spi_mpc8xxx.c: Do not use map_tx_dma to unmap rx_dma Joakim Tjernlund
     [not found] ` <1274102230-20828-1-git-send-email-Joakim.Tjernlund-SNLAxHN9vbcOP4wsBPIw7w@public.gmane.org>
2010-05-17 13:22   ` Anton Vorontsov
     [not found]     ` <20100517132254.GA6567-wnGakbxT3iijyJ0x5qLZdcN33GVbZNy3@public.gmane.org>
2010-05-21 17:23       ` Joakim Tjernlund
     [not found]         ` <OFD8B30A94.BD9EA490-ONC125772A.005F631A-C125772A.005F8E73-SNLAxHN9vbcOP4wsBPIw7w@public.gmane.org>
2010-05-22  5:54           ` Grant Likely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).