Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / input / keyboard / tca8418_keypad.c

diff --git a/drivers/input/keyboard/tca8418_keypad.c b/drivers/input/keyboard/tca8418_keypad.c
index 55c15304ddbce997a1027e319b81e7b3fc8ba98b..92c742420e207cf9c608505013f103eec5211127 100644 (file)
--- a/drivers/input/keyboard/tca8418_keypad.c
+++ b/drivers/input/keyboard/tca8418_keypad.c
@@ -274,6 +274,7 @@ static int tca8418_keypad_probe(struct i2c_client *client,
        bool irq_is_gpio = false;
        int irq;
        int error, row_shift, max_keys;
+       unsigned long trigger = 0;
 
        /* Copy the platform data */
        if (pdata) {
@@ -286,6 +287,7 @@ static int tca8418_keypad_probe(struct i2c_client *client,
                cols = pdata->cols;
                rep  = pdata->rep;
                irq_is_gpio = pdata->irq_is_gpio;
+               trigger = IRQF_TRIGGER_FALLING;
        } else {
                struct device_node *np = dev->of_node;
                int err;
@@ -360,9 +362,7 @@ static int tca8418_keypad_probe(struct i2c_client *client,
                irq = gpio_to_irq(irq);
 
        error = devm_request_threaded_irq(dev, irq, NULL, tca8418_irq_handler,
-                                         IRQF_TRIGGER_FALLING |
-                                               IRQF_SHARED |
-                                               IRQF_ONESHOT,
+                                         trigger | IRQF_SHARED | IRQF_ONESHOT,
                                          client->name, keypad_data);
        if (error) {
                dev_err(dev, "Unable to claim irq %d; error %d\n",