Input: gpio_keys - report initial state when opening the device

Instead of reporting the initial stage when the device is registered we
should do it when the device is opened (so there are users).

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 1a5cb6f34f4c53e2e9ca25f8f40ac45dedd12194..c7764ca17b88afda9b94217a16eba9edb0f4be2a 100644 (file)
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -526,12 +526,35 @@ fail:
        return error;
 }
 
+static void gpio_keys_report_state(struct gpio_keys_drvdata *ddata)
+{
+       struct input_dev *input = ddata->input;
+       int i;
+
+       for (i = 0; i < ddata->pdata->nbuttons; i++) {
+               struct gpio_button_data *bdata = &ddata->data[i];
+               if (gpio_is_valid(bdata->button->gpio))
+                       gpio_keys_gpio_report_event(bdata);
+       }
+       input_sync(input);
+}
+
 static int gpio_keys_open(struct input_dev *input)
 {
        struct gpio_keys_drvdata *ddata = input_get_drvdata(input);
        const struct gpio_keys_platform_data *pdata = ddata->pdata;
+       int error;
+
+       if (pdata->enable) {
+               error = pdata->enable(input->dev.parent);
+               if (error)
+                       return error;
+       }
 
-       return pdata->enable ? pdata->enable(input->dev.parent) : 0;
+       /* Report current state of buttons that are connected to GPIOs */
+       gpio_keys_report_state(ddata);
+
+       return 0;
 }
 
 static void gpio_keys_close(struct input_dev *input)
@@ -731,14 +754,6 @@ static int gpio_keys_probe(struct platform_device *pdev)
                goto fail3;
        }
 
-       /* get current state of buttons that are connected to GPIOs */
-       for (i = 0; i < pdata->nbuttons; i++) {
-               struct gpio_button_data *bdata = &ddata->data[i];
-               if (gpio_is_valid(bdata->button->gpio))
-                       gpio_keys_gpio_report_event(bdata);
-       }
-       input_sync(input);
-
        device_init_wakeup(&pdev->dev, wakeup);
 
        return 0;
@@ -810,11 +825,9 @@ static int gpio_keys_resume(struct device *dev)
                struct gpio_button_data *bdata = &ddata->data[i];
                if (bdata->button->wakeup && device_may_wakeup(dev))
                        disable_irq_wake(bdata->irq);
-
-               if (gpio_is_valid(bdata->button->gpio))
-                       gpio_keys_gpio_report_event(bdata);
        }
-       input_sync(ddata->input);
+
+       gpio_keys_report_state(ddata);
 
        return 0;
 }