diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:32:53 +0000 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-03-26 02:32:53 +0000 |
| commit | 38b587878eee8f9f2664135ab76805d0510bb997 (patch) | |
| tree | 66f5c8eb8821dc7fa1fe91741b24ff7291ef3bf1 /drivers/dma/xilinx/zynqmp_dma.c | |
| parent | 323174b55ef1de0c70ed0b268fcaf9f2d6f842c6 (diff) | |
| parent | 24f70aa804cd7f8fee4353cf4990997d1c8375ae (diff) | |
Merge tag 'v4.9.90' into linux-linaro-lsk-v4.9lsk-v4.9-18.03
This is the 4.9.90 stable release
Diffstat (limited to 'drivers/dma/xilinx/zynqmp_dma.c')
| -rw-r--r-- | drivers/dma/xilinx/zynqmp_dma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/xilinx/zynqmp_dma.c b/drivers/dma/xilinx/zynqmp_dma.c index 6d221e5c72ee..22658057fe27 100644 --- a/drivers/dma/xilinx/zynqmp_dma.c +++ b/drivers/dma/xilinx/zynqmp_dma.c @@ -933,7 +933,8 @@ static void zynqmp_dma_chan_remove(struct zynqmp_dma_chan *chan) if (!chan) return; - devm_free_irq(chan->zdev->dev, chan->irq, chan); + if (chan->irq) + devm_free_irq(chan->zdev->dev, chan->irq, chan); tasklet_kill(&chan->tasklet); list_del(&chan->common.device_node); clk_disable_unprepare(chan->clk_apb); |