Merge tag 'for-linus' of git://github.com/openrisc/linux

[linux-2.6-microblaze.git] / drivers / hid / wacom_sys.c

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 57bfa0a..93f49b7 100644 (file)
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -2287,7 +2287,13 @@ static void wacom_set_shared_values(struct wacom_wac *wacom_wac)
 
        if (wacom_wac->has_mute_touch_switch) {
                wacom_wac->shared->has_mute_touch_switch = true;
-               wacom_wac->shared->is_touch_on = true;
+               /* Hardware touch switch may be off. Wait until
+                * we know the switch state to decide is_touch_on.
+                * Softkey state should be initialized to "on" to
+                * match historic default.
+                */
+               if (wacom_wac->is_soft_touch_switch)
+                       wacom_wac->shared->is_touch_on = true;
        }
 
        if (wacom_wac->shared->has_mute_touch_switch &&
@@ -2791,6 +2797,7 @@ static int wacom_probe(struct hid_device *hdev,
                                 error);
        }
 
+       wacom_wac->probe_complete = true;
        return 0;
 }