Commit 75abeb6b authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/axi' into for-linus

parents d9a3255f 9c87572e

drivers/dma/dma-axi-dmac.c

+1 −1
Original line number Diff line number Diff line
@@ -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;