diff options
author | Vinod Koul <vkoul@kernel.org> | 2018-06-04 10:27:53 +0530 |
---|---|---|
committer | Vinod Koul <vkoul@kernel.org> | 2018-06-04 10:27:53 +0530 |
commit | 75abeb6b7239341462d45b95246a4417ffa60656 (patch) | |
tree | fab639f4da5afd1c971de4b64c346036c426dc38 /drivers/dma | |
parent | d9a3255fbfa41c6f44d823827601eea80420cdd9 (diff) | |
parent | 9c87572eca7592b996d4c8c51dfd858fd7b1f151 (diff) | |
download | linux-stable-75abeb6b7239341462d45b95246a4417ffa60656.tar.gz linux-stable-75abeb6b7239341462d45b95246a4417ffa60656.tar.bz2 linux-stable-75abeb6b7239341462d45b95246a4417ffa60656.zip |
Merge branch 'topic/axi' into for-linus
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/dma-axi-dmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/dma-axi-dmac.c b/drivers/dma/dma-axi-dmac.c index 2419fe524daa..15b2453d2647 100644 --- a/drivers/dma/dma-axi-dmac.c +++ b/drivers/dma/dma-axi-dmac.c @@ -687,7 +687,7 @@ static int axi_dmac_probe(struct platform_device *pdev) if (ret) goto err_unregister_device; - ret = request_irq(dmac->irq, axi_dmac_interrupt_handler, 0, + ret = request_irq(dmac->irq, axi_dmac_interrupt_handler, IRQF_SHARED, dev_name(&pdev->dev), dmac); if (ret) goto err_unregister_of; |