From 0416939e4011971a431d3a9c0766257793d07a56 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sat, 23 May 2009 19:36:58 +0200 Subject: keymap: fix selection of event devices Using DEVNAME=="..." is invalid, we mean KERNEL=="..." here. Instead of adding this to individual rules, short-circuit the entire keymap rules file for non-event devices. --- keymap/95-keymap.rules | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/keymap/95-keymap.rules b/keymap/95-keymap.rules index 21eb67b..915fbb7 100644 --- a/keymap/95-keymap.rules +++ b/keymap/95-keymap.rules @@ -1,5 +1,6 @@ ACTION!="add", GOTO="keyboard_end" SUBSYSTEM!="input", GOTO="keyboard_end" +KERNEL!="event*", GOTO="keyboard_end" # # The following are exposed as separate input devices with low key codes, thus @@ -10,10 +11,10 @@ ATTR{[dmi/id]sys_vendor}=="IBM*", ATTR{name}=="ThinkPad Extra Buttons", RUN+="ke ATTR{[dmi/id]sys_vendor}=="LENOVO*", ATTR{name}=="ThinkPad Extra Buttons", RUN+="keymap $name module-lenovo" ATTR{[dmi/id]sys_vendor}=="ASUS*", ATTR{name}=="Asus Extra Buttons", ATTR{[dmi/id]product_name}=="W3J", RUN+="keymap $name module-asus-w3j" -ATTR{[dmi/id]sys_vendor}=="Sony*", DEVNAME=="/dev/input/event*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony" +ATTR{[dmi/id]sys_vendor}=="Sony*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony" # Older Vaios have some different keys -ATTR{[dmi/id]sys_vendor}=="Sony*", ATTR{[dmi/id]product_name}=="*PCG-C1*|*PCG-K25*|*PCG-F1*|*PCG-F2*|*PCG-F3*|*PCG-F4*|*PCG-F5*|*PCG-F6*|*PCG-FX*|*PCG-FRV*|*PCG-GR*|*PCG-TR*|*PCG-NV*|*PCG-Z*|*VGN-S360*|*VGN-SZ2HP_B*", DEVNAME=="/dev/input/event*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony-old" +ATTR{[dmi/id]sys_vendor}=="Sony*", ATTR{[dmi/id]product_name}=="*PCG-C1*|*PCG-K25*|*PCG-F1*|*PCG-F2*|*PCG-F3*|*PCG-F4*|*PCG-F5*|*PCG-F6*|*PCG-FX*|*PCG-FRV*|*PCG-GR*|*PCG-TR*|*PCG-NV*|*PCG-Z*|*VGN-S360*|*VGN-SZ2HP_B*", ATTRS{name}=="Sony Vaio Keys", RUN+="keymap $name module-sony-old" # # The following rules belong to standard i8042 AT keyboard with high key codes. -- cgit