The patch titled Fix typo in atmel_spi.c has been added to the -mm tree. Its filename is fix-typo-in-atmel_spic.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: Fix typo in atmel_spi.c From: Andrew Victor <andrew@xxxxxxxxxxxxx> Fix cut 'n paste bug in Atmel SPI driver. Signed-off-by: Andrew Victor <andrew@xxxxxxxxxxxxx> Acked-by: David Brownell <david-b@xxxxxxxxxxx> Cc: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/spi/atmel_spi.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/spi/atmel_spi.c~fix-typo-in-atmel_spic drivers/spi/atmel_spi.c --- a/drivers/spi/atmel_spi.c~fix-typo-in-atmel_spic +++ a/drivers/spi/atmel_spi.c @@ -251,7 +251,7 @@ atmel_spi_dma_map_xfer(struct atmel_spi xfer->rx_dma = dma_map_single(dev, xfer->rx_buf, xfer->len, DMA_FROM_DEVICE); - if (dma_mapping_error(xfer->tx_dma)) { + if (dma_mapping_error(xfer->rx_dma)) { if (xfer->tx_buf) dma_unmap_single(dev, xfer->tx_dma, xfer->len, _ Patches currently in -mm which might be from andrew@xxxxxxxxxxxxx are origin.patch fix-typo-in-atmel_spic.patch at91-remove-at91_lcdch.patch git-mtd.patch driver-for-the-atmel-on-chip-ssc-on-at32ap-and-at91.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html