X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=rules%2F78-sound-card.rules;h=295f4901505991f34bc550ad5a7eb842b42ffbbd;hp=cc6485c28b454a8d39cb3fe19e7163211a6882f7;hb=87b934960ab514dec4b96ed4ef23c40bc61d3ceb;hpb=427c9ba24a8138ea3a9c17ebc661df9290dfbcf2

diff --git a/rules/78-sound-card.rules b/rules/78-sound-card.rules
index cc6485c28..295f49015 100644
--- a/rules/78-sound-card.rules
+++ b/rules/78-sound-card.rules
@@ -37,17 +37,16 @@ KERNEL!="card*", GOTO="sound_end"
 
 ENV{SOUND_INITIALIZED}="1"
 
+IMPORT{builtin}="hwdb"
 SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id"
-SUBSYSTEMS=="usb", IMPORT{builtin}="usb-db"
 SUBSYSTEMS=="usb", GOTO="skip_pci"
 
 SUBSYSTEMS=="firewire", ATTRS{vendor_name}=="?*", ATTRS{model_name}=="?*", \
   ENV{ID_BUS}="firewire", ENV{ID_VENDOR}="$attr{vendor_name}", ENV{ID_MODEL}="$attr{model_name}"
+SUBSYSTEMS=="firewire", ATTRS{guid}=="?*", ENV{ID_ID}="firewire-$attr{guid}"
 SUBSYSTEMS=="firewire", GOTO="skip_pci"
 
-SUBSYSTEMS=="pci", IMPORT{builtin}="pci-db"
 SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
-
 LABEL="skip_pci"
 
 ENV{ID_SERIAL}=="?*", ENV{ID_USB_INTERFACE_NUM}=="?*", ENV{ID_ID}="$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_USB_INTERFACE_NUM}-$attr{id}"