summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2012-10-25 22:17:05 +0200
committerKay Sievers <kay@vrfy.org>2012-10-25 22:17:05 +0200
commitf17491e27d5a4258516249a0369b95a0e1544ab8 (patch)
treeb367f38748bf8de161e5ba00629475395a7f7a20
parent7ee40fc3e93fa97be28f129dd457de74c58e9de4 (diff)
rules: fix usb_id/hwdb mixup in tty-description.rules
<grawity> btw, in 15ce372b75a "call 'hwdb' with --subsystem=" you actually added "usb_id --subsystem=usb" (75-tty-description.rules) <kay> ouch :)
-rw-r--r--rules/75-tty-description.rules7
1 files changed, 4 insertions, 3 deletions
diff --git a/rules/75-tty-description.rules b/rules/75-tty-description.rules
index c8ee376baf..bfa6de39e9 100644
--- a/rules/75-tty-description.rules
+++ b/rules/75-tty-description.rules
@@ -3,12 +3,13 @@
ACTION=="remove", GOTO="tty_end"
SUBSYSTEM!="tty", GOTO="tty_end"
-IMPORT{builtin}="hwdb"
-
-SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id --subsystem=usb"
+SUBSYSTEMS=="usb", ENV{ID_MODEL}=="", IMPORT{builtin}="usb_id"
+SUBSYSTEMS=="usb", IMPORT{builtin}="hwdb --subsystem=usb"
SUBSYSTEMS=="usb", ATTRS{idVendor}!="", ATTRS{idProduct}!="", ENV{ID_VENDOR_ID}="$attr{idVendor}", ENV{ID_MODEL_ID}="$attr{idProduct}"
SUBSYSTEMS=="usb", GOTO="tty_end"
+SUBSYSTEMS=="pci", IMPORT{builtin}="hwdb --subsystem=usb"
SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
+
LABEL="tty_end"