to fix scancodes returned by sony-laptop driver

Fix scancodes returned by driver to match scancodes used to remap keys.

(Before the patch FN/E returned scancode 0x1B, but to remap scancode
0x14 had to be used).

The scancodes returned by the sony-laptop driver for function keys did not
match the scancodes used to remap keys.  Also, since the scancode was sent
to the input subsystem after the mapped keysym the /lib/udev/keymap
utility was confused about which scancode to report for which keysym.

This patch fixes the driver so the correct scancode is shown for each
key.  It also adds to the documentation a description of where to find
the scancodes.

Signed-off-by: John Hughes <john@calva.com>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Matthew Garrett <mjg@redhat.com>

2 files changed, 13 insertions, 5 deletions

diff --git a/Documentation/laptops/sony-laptop.txt b/Documentation/laptops/sony-laptop.txt
index 2bd4e82e5d9f..0d5ac7f5287e 100644
--- a/Documentation/laptops/sony-laptop.txt
+++ b/Documentation/laptops/sony-laptop.txt
@@ -17,6 +17,11 @@ subsystem. See the logs of acpid or /proc/acpi/event and
 devices are created by the driver. Additionally, loading the driver with the
 debug option will report all events in the kernel log.
 
+The "scancodes" passed to the input system (that can be remapped with udev)
+are indexes to the table "sony_laptop_input_keycode_map" in the sony-laptop.c
+module.  For example the "FN/E" key combination (EJECTCD on some models)
+generates the scancode 20 (0x14).
+
 Backlight control:
 ------------------
 If your laptop model supports it, you will find sysfs files in the
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
index 40c470507e50..8a51795aa02a 100644
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
@@ -347,6 +347,7 @@ static void sony_laptop_report_input_event(u8 event)
         struct input_dev *jog_dev = sony_laptop_input.jog_dev;
         struct input_dev *key_dev = sony_laptop_input.key_dev;
         struct sony_laptop_keypress kp = { NULL };
+        int scancode = -1;
 
         if (event == SONYPI_EVENT_FNKEY_RELEASED ||
                         event == SONYPI_EVENT_ANYBUTTON_RELEASED) {
@@ -380,8 +381,8 @@ static void sony_laptop_report_input_event(u8 event)
                         dprintk("sony_laptop_report_input_event, event not known: %d\n", event);
                         break;
                 }
-                if (sony_laptop_input_index[event] != -1) {
-                        kp.key = sony_laptop_input_keycode_map[sony_laptop_input_index[event]];
+                if ((scancode = sony_laptop_input_index[event]) != -1) {
+                        kp.key = sony_laptop_input_keycode_map[scancode];
                         if (kp.key != KEY_UNKNOWN)
                                 kp.dev = key_dev;
                 }
@@ -389,9 +390,11 @@ static void sony_laptop_report_input_event(u8 event)
         }
 
         if (kp.dev) {
+                /* if we have a scancode we emit it so we can always
+                    remap the key */
+                if (scancode != -1)
+                        input_event(kp.dev, EV_MSC, MSC_SCAN, scancode);
                 input_report_key(kp.dev, kp.key, 1);
-                /* we emit the scancode so we can always remap the key */
-                input_event(kp.dev, EV_MSC, MSC_SCAN, event);
                 input_sync(kp.dev);
 
                 /* schedule key release */
@@ -466,7 +469,7 @@ static int sony_laptop_setup_input(struct acpi_device *acpi_device)
         jog_dev->name = "Sony Vaio Jogdial";
         jog_dev->id.bustype = BUS_ISA;
         jog_dev->id.vendor = PCI_VENDOR_ID_SONY;
-        key_dev->dev.parent = &acpi_device->dev;
+        jog_dev->dev.parent = &acpi_device->dev;
 
         input_set_capability(jog_dev, EV_KEY, BTN_MIDDLE);
         input_set_capability(jog_dev, EV_REL, REL_WHEEL);