thinkpad-acpi: fix poll thread auto-start

commit b589ea4c44170d3f7a845684e2d1b3b9571663af upstream.

The driver was not starting the NVRAM polling thread if the input
device was bound immediately after registration.

This fixes:
http://bugzilla.kernel.org/show_bug.cgi?id=15118

Reported-by: Florian Zumbiehl <florz@florz.de>
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 6 insertions, 9 deletions

diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index 159a1f877d91..e63a4f2b1ff7 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -2607,16 +2607,11 @@ static int hotkey_inputdev_open(struct input_dev *dev)
 {
         switch (tpacpi_lifecycle) {
         case TPACPI_LIFE_INIT:
-                /*
-                 * hotkey_init will call hotkey_poll_setup_safe
-                 * at the appropriate moment
-                 */
-                return 0;
-        case TPACPI_LIFE_EXITING:
-                return -EBUSY;
         case TPACPI_LIFE_RUNNING:
                 hotkey_poll_setup_safe(false);
                 return 0;
+        case TPACPI_LIFE_EXITING:
+                return -EBUSY;
         }
 
         /* Should only happen if tpacpi_lifecycle is corrupt */
@@ -2627,7 +2622,7 @@ static int hotkey_inputdev_open(struct input_dev *dev)
 static void hotkey_inputdev_close(struct input_dev *dev)
 {
         /* disable hotkey polling when possible */
-        if (tpacpi_lifecycle == TPACPI_LIFE_RUNNING &&
+        if (tpacpi_lifecycle != TPACPI_LIFE_EXITING &&
             !(hotkey_source_mask & hotkey_driver_mask))
                 hotkey_poll_setup_safe(false);
 }
@@ -9051,6 +9046,9 @@ static int __init thinkpad_acpi_module_init(void)
                         return ret;
                 }
         }
+
+        tpacpi_lifecycle = TPACPI_LIFE_RUNNING;
+
         ret = input_register_device(tpacpi_inputdev);
         if (ret < 0) {
                 printk(TPACPI_ERR "unable to register input device\n");
@@ -9060,7 +9058,6 @@ static int __init thinkpad_acpi_module_init(void)
                 tp_features.input_device_registered = 1;
         }
 
-        tpacpi_lifecycle = TPACPI_LIFE_RUNNING;
         return 0;
 }