summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-04-16 22:45:26 +0530
committerVinod Koul <vinod.koul@intel.com>2016-04-16 22:45:26 +0530
commit1cc3334e2e0263b02163a9edd43d0448ac00770c (patch)
treec034f6fa034d8e09edc3181bbda3289fb327c918
parent4bd613596bc8572dee8a0683a24f6f931841b695 (diff)
parent330ed4da2c8eb821e70b1366a7af53eb1c7421fb (diff)
downloadlinux-1cc3334e2e0263b02163a9edd43d0448ac00770c.tar.bz2
Merge branch 'fix/xilinx' into fixes
-rw-r--r--drivers/dma/xilinx/xilinx_vdma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/xilinx/xilinx_vdma.c b/drivers/dma/xilinx/xilinx_vdma.c
index 0ee0321868d3..ef67f278e076 100644
--- a/drivers/dma/xilinx/xilinx_vdma.c
+++ b/drivers/dma/xilinx/xilinx_vdma.c
@@ -1236,7 +1236,7 @@ static struct dma_chan *of_dma_xilinx_xlate(struct of_phandle_args *dma_spec,
struct xilinx_vdma_device *xdev = ofdma->of_dma_data;
int chan_id = dma_spec->args[0];
- if (chan_id >= XILINX_VDMA_MAX_CHANS_PER_DEVICE)
+ if (chan_id >= XILINX_VDMA_MAX_CHANS_PER_DEVICE || !xdev->chan[chan_id])
return NULL;
return dma_get_slave_channel(&xdev->chan[chan_id]->common);