Merge tag 'mfd-for-linus-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[cascardo/linux.git] / drivers / mfd / ucb1x00-core.c

diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index 9ab9ec4..d6fb2e1 100644 (file)
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -446,10 +446,6 @@ static int ucb1x00_detect_irq(struct ucb1x00 *ucb)
        unsigned long mask;
 
        mask = probe_irq_on();
-       if (!mask) {
-               probe_irq_off(mask);
-               return NO_IRQ;
-       }
 
        /*
         * Enable the ADC interrupt.
@@ -541,7 +537,7 @@ static int ucb1x00_probe(struct mcp *mcp)
        ucb1x00_enable(ucb);
        ucb->irq = ucb1x00_detect_irq(ucb);
        ucb1x00_disable(ucb);
-       if (ucb->irq == NO_IRQ) {
+       if (!ucb->irq) {
                dev_err(&ucb->dev, "IRQ probe failed\n");
                ret = -ENODEV;
                goto err_no_irq;