Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 06:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'topic/axi' into for-linus

Browse Source
This commit is contained in:
Vinod Koul 2016-07-16 20:09:24 +05:30
commit 488bace2f1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/dma/dma-axi-dmac.c
View File

@ -270,6 +270,9 @@ static irqreturn_t axi_dmac_interrupt_handler(int irq, void *devid)
unsigned int pending; unsigned int pending;
pending = axi_dmac_read(dmac, AXI_DMAC_REG_IRQ_PENDING); pending = axi_dmac_read(dmac, AXI_DMAC_REG_IRQ_PENDING);
if (!pending)
return IRQ_NONE;
axi_dmac_write(dmac, AXI_DMAC_REG_IRQ_PENDING, pending); axi_dmac_write(dmac, AXI_DMAC_REG_IRQ_PENDING, pending);
spin_lock(&dmac->chan.vchan.lock); spin_lock(&dmac->chan.vchan.lock);
@ -579,7 +582,9 @@ static int axi_dmac_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
dmac->irq = platform_get_irq(pdev, 0); dmac->irq = platform_get_irq(pdev, 0);
if (dmac->irq <= 0) if (dmac->irq < 0)
return dmac->irq;
if (dmac->irq == 0)
return -EINVAL; return -EINVAL;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@ -683,6 +688,7 @@ static const struct of_device_id axi_dmac_of_match_table[] = {
{ .compatible = "adi,axi-dmac-1.00.a" }, { .compatible = "adi,axi-dmac-1.00.a" },
{ }, { },
}; };
MODULE_DEVICE_TABLE(of, axi_dmac_of_match_table);
static struct platform_driver axi_dmac_driver = { static struct platform_driver axi_dmac_driver = {
.driver = { .driver = {