[systemd-commits] hwdb/60-keyboard.hwdb

[Martin Pitt]

 hwdb/60-keyboard.hwdb |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ee2babf4c36f9ab65e9ebbe966ed7839c532df45
Author: Martin Pitt <martinpitt at gnome.org>
Date:   Mon Sep 2 08:11:07 2013 +0200

    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.

diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
index abeb03d..1fd8a88 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