diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-24 13:17:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-01-24 13:17:49 -0500 |
| commit | 3f58e0945eb064777f7b77e65ae44cb4f1efc92e (patch) | |
| tree | 46b49ddc57887a52ba7c0d820e06d7313a7ce64b /drivers/dma/ioat | |
| parent | acc5da0f9d89299b4115cf9cb995c0157cd6bf12 (diff) | |
| parent | b9bb37f5486ba05d2b557dbf1aeb754fef618985 (diff) | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul:
"A few fixes on slave dmanengine. There are trivial fixes in imx-dma,
tegra-dma & ioat driver"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dma: tegra: implement flags parameters for cyclic transfer
dmaengine: imx-dma: Disable use of hw_chain to fix sg_dma transfers.
ioat: Fix DMA memory sync direction correct flag
Diffstat (limited to 'drivers/dma/ioat')
| -rw-r--r-- | drivers/dma/ioat/dma_v3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c index e5fc944de1f0..3e9d66920eb3 100644 --- a/drivers/dma/ioat/dma_v3.c +++ b/drivers/dma/ioat/dma_v3.c | |||
| @@ -951,7 +951,7 @@ static int ioat_xor_val_self_test(struct ioatdma_device *device) | |||
| 951 | goto free_resources; | 951 | goto free_resources; |
| 952 | } | 952 | } |
| 953 | } | 953 | } |
| 954 | dma_sync_single_for_device(dev, dest_dma, PAGE_SIZE, DMA_TO_DEVICE); | 954 | dma_sync_single_for_device(dev, dest_dma, PAGE_SIZE, DMA_FROM_DEVICE); |
| 955 | 955 | ||
| 956 | /* skip validate if the capability is not present */ | 956 | /* skip validate if the capability is not present */ |
| 957 | if (!dma_has_cap(DMA_XOR_VAL, dma_chan->device->cap_mask)) | 957 | if (!dma_has_cap(DMA_XOR_VAL, dma_chan->device->cap_mask)) |