Merge branch 'next' into for-linus

[~andy/linux] / drivers / input / keyboard / adp5588-keys.c

diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c
index e34eeb8ae371e3e569220f7cb20ab49ddda6fa77..4a7f534cf64b3692e8702654a7f085eb306a477b 100644 (file)
--- a/drivers/input/keyboard/adp5588-keys.c
+++ b/drivers/input/keyboard/adp5588-keys.c
@@ -550,7 +550,7 @@ static int __devinit adp5588_probe(struct i2c_client *client,
        }
 
        error = request_irq(client->irq, adp5588_irq,
-                           IRQF_TRIGGER_FALLING | IRQF_DISABLED,
+                           IRQF_TRIGGER_FALLING,
                            client->dev.driver->name, kpad);
        if (error) {
                dev_err(&client->dev, "irq %d busy?\n", client->irq);