diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2015-02-05 22:49:46 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2015-02-05 22:49:46 -0500 |
| commit | af76f02b3b52def78b5f9c4a000f1556c7448e33 (patch) | |
| tree | 340d4b1696fce5bf41952f6860ffeb142d49b2e0 /drivers/spi/spi-pl022.c | |
| parent | e61091b71143f0a7a9c2fbdf4c5a6cebd4268394 (diff) | |
| parent | 28895317f9a7d726cd13fc9b5447cb5dcb5cd22c (diff) | |
Merge tag 'v3.4.106' into v3.4-rt
This is the 3.4.106 stable release
Conflicts:
arch/x86/kernel/traps.c
Diffstat (limited to 'drivers/spi/spi-pl022.c')
| -rw-r--r-- | drivers/spi/spi-pl022.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 469eb28e8328..e3b845ae93c6 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c @@ -1061,7 +1061,7 @@ err_rxdesc: pl022->sgt_tx.nents, DMA_TO_DEVICE); err_tx_sgmap: dma_unmap_sg(rxchan->device->dev, pl022->sgt_rx.sgl, - pl022->sgt_tx.nents, DMA_FROM_DEVICE); + pl022->sgt_rx.nents, DMA_FROM_DEVICE); err_rx_sgmap: sg_free_table(&pl022->sgt_tx); err_alloc_tx_sg: |