summaryrefslogtreecommitdiff
path: root/hwdb
diff options
context:
space:
mode:
authorMartin Pitt <martinpitt@gnome.org>2013-09-02 08:11:07 +0200
committerAnthony G. Basile <blueness@gentoo.org>2013-09-10 05:12:39 -0400
commit5e61dd00dc1c2dd0635c7dd2896d475bd53feb4d (patch)
tree94319f50379b2b83613558d22df02b0527b1653b /hwdb
parent1f561b6e9eac9d6be50ed9b33f8e7d5b059dfc21 (diff)
keymap: Explicitly match "any product name" for "all models from vendor" rules
Without this, the hwdb trie gets mis-sorted to match the more specific rules first, as ":pvr" is lexicographically after ":pn". So ensure that all our matches have some ":pn" match to avoid this trap.
Diffstat (limited to 'hwdb')
-rw-r--r--hwdb/60-keyboard.hwdb6
1 files changed, 3 insertions, 3 deletions
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
index abeb03df8d..1fd8a8846e 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -158,7 +158,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnAlienware*:pn*
# Asus
###########################################################
-keyboard:dmi:bvn*:bvr*:bd*:svnASUS:*
+keyboard:dmi:bvn*:bvr*:bd*:svnASUS:pn*
KEYBOARD_KEY_ed=volumeup
KEYBOARD_KEY_ee=volumedown
KEYBOARD_KEY_ef=mute
@@ -192,7 +192,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svnCompaq*:pn*Evo*N*:pvr*
# Dell
###########################################################
-keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pn*
KEYBOARD_KEY_81=playpause # Play/Pause
KEYBOARD_KEY_82=stopcd # Stop
KEYBOARD_KEY_83=previoussong # Previous song
@@ -866,7 +866,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svn*:pn*:pvr*:rvnQuanta:rn30B7:rvr65.2B:*
# Samsung
###########################################################
-keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pvr*
+keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*
KEYBOARD_KEY_74=prog1 # User key
KEYBOARD_KEY_75=www
KEYBOARD_KEY_78=mail