Merge tag 'locks-v4.9-1' of git://git.samba.org/jlayton/linux

[cascardo/linux.git] / drivers / dma / hsu / pci.c

diff --git a/drivers/dma/hsu/pci.c b/drivers/dma/hsu/pci.c
index 9916058..b51639f 100644 (file)
--- a/drivers/dma/hsu/pci.c
+++ b/drivers/dma/hsu/pci.c
@@ -29,7 +29,7 @@ static irqreturn_t hsu_pci_irq(int irq, void *dev)
        u32 dmaisr;
        u32 status;
        unsigned short i;
-       irqreturn_t ret = IRQ_NONE;
+       int ret = 0;
        int err;
 
        dmaisr = readl(chip->regs + HSU_PCI_DMAISR);
@@ -37,14 +37,14 @@ static irqreturn_t hsu_pci_irq(int irq, void *dev)
                if (dmaisr & 0x1) {
                        err = hsu_dma_get_status(chip, i, &status);
                        if (err > 0)
-                               ret |= IRQ_HANDLED;
+                               ret |= 1;
                        else if (err == 0)
                                ret |= hsu_dma_do_irq(chip, i, status);
                }
                dmaisr >>= 1;
        }
 
-       return ret;
+       return IRQ_RETVAL(ret);
 }
 
 static int hsu_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)