*/
        if (client->irq > 0) {
                status = request_irq(client->irq, tps65010_irq,
-                                    IRQF_TRIGGER_FALLING, DRIVER_NAME, tps);
+                                    IRQF_TRIGGER_FALLING | IRQF_NO_AUTOEN,
+                                    DRIVER_NAME, tps);
                if (status < 0) {
                        dev_dbg(&client->dev, "can't get IRQ %d, err %d\n",
                                        client->irq, status);
                        return status;
                }
-               /* annoying race here, ideally we'd have an option
-                * to claim the irq now and enable it later.
-                * FIXME genirq IRQF_NOAUTOEN now solves that ...
-                */
-               disable_irq(client->irq);
                set_bit(FLAG_IRQ_ENABLE, &tps->flags);
        } else
                dev_warn(&client->dev, "IRQ not configured!\n");