diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-25 16:43:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-25 16:43:08 -0700 |
| commit | 985e775573943327bba16326013f56f62c43292c (patch) | |
| tree | bb48056d6a1f2499ebb9e7e1f7b4f3d827af975b /drivers | |
| parent | 9e15400180a17c3b41b86a03bb96b2aebed86e64 (diff) | |
| parent | 7f5770678b2d0cc8f3ffbf7eb73410f2acba7925 (diff) | |
Merge tag 'dmaengine-fix-4.13-rc7' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fix from Vinod Koul:
"A single fix for tegra210-adma driver to check of_irq_get() error"
* tag 'dmaengine-fix-4.13-rc7' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: tegra210-adma: fix of_irq_get() error check
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dma/tegra210-adma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c index b10cbaa82ff5..b26256f23d67 100644 --- a/drivers/dma/tegra210-adma.c +++ b/drivers/dma/tegra210-adma.c @@ -717,8 +717,8 @@ static int tegra_adma_probe(struct platform_device *pdev) tdc->chan_addr = tdma->base_addr + ADMA_CH_REG_OFFSET(i); tdc->irq = of_irq_get(pdev->dev.of_node, i); - if (tdc->irq < 0) { - ret = tdc->irq; + if (tdc->irq <= 0) { + ret = tdc->irq ?: -ENXIO; goto irq_dispose; } |