Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux-2.6-microblaze.git] / drivers / input / keyboard / cros_ec_keyb.c

diff --git a/drivers/input/keyboard/cros_ec_keyb.c b/drivers/input/keyboard/cros_ec_keyb.c
index fc1793c..1f0d61b 100644 (file)
--- a/drivers/input/keyboard/cros_ec_keyb.c
+++ b/drivers/input/keyboard/cros_ec_keyb.c
@@ -183,6 +183,7 @@ static void cros_ec_keyb_process(struct cros_ec_keyb *ckdev,
                                        "changed: [r%d c%d]: byte %02x\n",
                                        row, col, new_state);
 
+                               input_event(idev, EV_MSC, MSC_SCAN, pos);
                                input_report_key(idev, keycodes[pos],
                                                 new_state);
                        }
@@ -348,7 +349,7 @@ static int cros_ec_keyb_info(struct cros_ec_device *ec_dev,
        params->event_type = event_type;
 
        ret = cros_ec_cmd_xfer_status(ec_dev, msg);
-       if (ret == -ENOTSUPP) {
+       if (ret == -ENOPROTOOPT) {
                /* With older ECs we just return 0 for everything */
                memset(result, 0, result_size);
                ret = 0;