HID: google: whiskers: signal tablet mode on connect

When we receive "keyboard position" event from Whiskers we can
conclude that the base is attached, even if we did not get EC event
for that. We may miss EC event because there are some units which
have a lot of leakage on the ADC pins that the EC uses to determine
whether or not a base is attached.

Signed-off-by: Dmitry Torokhov <dtor@chromium.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

diff --git a/drivers/hid/hid-google-hammer.c b/drivers/hid/hid-google-hammer.c
index 3dc6116c8f7632684a8e84231a2e3d2fa2fb0218..31e4a39946f59ad4fd37b4bf65712b256dbff955 100644 (file)
--- a/drivers/hid/hid-google-hammer.c
+++ b/drivers/hid/hid-google-hammer.c
@@ -402,16 +402,16 @@ static int hammer_event(struct hid_device *hid, struct hid_field *field,
            usage->hid == WHISKERS_KBD_FOLDED) {
                spin_lock_irqsave(&cbas_ec_lock, flags);
 
+               /*
+                * If we are getting events from Whiskers that means that it
+                * is attached to the lid.
+                */
+               cbas_ec.base_present = true;
                cbas_ec.base_folded = value;
                hid_dbg(hid, "%s: base: %d, folded: %d\n", __func__,
                        cbas_ec.base_present, cbas_ec.base_folded);
 
-               /*
-                * We should not get event if base is detached, but in case
-                * we happen to service HID and EC notifications out of order
-                * let's still check the "base present" flag.
-                */
-               if (cbas_ec.input && cbas_ec.base_present) {
+               if (cbas_ec.input) {
                        input_report_switch(cbas_ec.input,
                                            SW_TABLET_MODE, value);
                        input_sync(cbas_ec.input);