diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-20 10:15:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-20 10:15:21 -0800 |
| commit | 9fa686068a32ddf256df03982b3e3967c18654a8 (patch) | |
| tree | 888adef0b50c93df4c40c4b5555a6c17460320c1 /drivers/dma/edma.c | |
| parent | Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild (diff) | |
| parent | dmaengine: rcar-dmac: Document SoC specific bindings (diff) | |
| download | linux-dev-9fa686068a32ddf256df03982b3e3967c18654a8.tar.xz linux-dev-9fa686068a32ddf256df03982b3e3967c18654a8.zip | |
Merge tag 'dmaengine-fix-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fixes from Vinod Koul:
"Here is my second pull request for this window:
A few driver fixes have piled up and one missed rcar bindings patch
which got somehow lost in for-linus branch so cherry-picked that one.
Fixes are for dw, at_hdmac, edma"
* tag 'dmaengine-fix-4.5-rc1' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: rcar-dmac: Document SoC specific bindings
dmaengine: at_xdmac: fix resume for cyclic transfers
dmaengine: dw: fix cyclic transfer callbacks
dmaengine: dw: fix cyclic transfer setup
dmaengine: edma: Fix paRAM slot allocation for entry channel 0
Diffstat (limited to 'drivers/dma/edma.c')
| -rw-r--r-- | drivers/dma/edma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index 50584015e046..d92d65549406 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -484,7 +484,7 @@ static void edma_read_slot(struct edma_cc *ecc, unsigned slot, */ static int edma_alloc_slot(struct edma_cc *ecc, int slot) { - if (slot > 0) { + if (slot >= 0) { slot = EDMA_CHAN_SLOT(slot); /* Requesting entry paRAM slot for a HW triggered channel. */ if (ecc->chmap_exist && slot < ecc->num_channels) |