Merge remote-tracking branch 'lightnvm/for-next'

[deliverable/linux.git] / drivers / ptp / ptp_ixp46x.c

diff --git a/drivers/ptp/ptp_ixp46x.c b/drivers/ptp/ptp_ixp46x.c
index ee4f183ef9eed337b012c4088bfeba5ae0c949a3..344a3bac210b63003f94130aec94f3df4b17961a 100644 (file)
--- a/drivers/ptp/ptp_ixp46x.c
+++ b/drivers/ptp/ptp_ixp46x.c
@@ -268,18 +268,19 @@ static int setup_interrupt(int gpio)
                return err;
 
        irq = gpio_to_irq(gpio);
+       if (irq < 0)
+               return irq;
 
-       if (NO_IRQ == irq)
-               return NO_IRQ;
-
-       if (irq_set_irq_type(irq, IRQF_TRIGGER_FALLING)) {
+       err = irq_set_irq_type(irq, IRQF_TRIGGER_FALLING);
+       if (err) {
                pr_err("cannot set trigger type for irq %d\n", irq);
-               return NO_IRQ;
+               return err;
        }
 
-       if (request_irq(irq, isr, 0, DRIVER, &ixp_clock)) {
+       err = request_irq(irq, isr, 0, DRIVER, &ixp_clock);
+       if (err) {
                pr_err("request_irq failed for irq %d\n", irq);
-               return NO_IRQ;
+               return err;
        }
 
        return irq;