X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=rules%2Frules.d%2F78-sound-card.rules;h=0f0cf64d7c037ef2cd0ecdc4e920e3cb5b1013e0;hb=421fbc71c7e951dac900eabd445dfe577158b9c3;hp=1a9cea2b72f3b1d301083eff193fb53fa1deba61;hpb=069eab7c96532ab32ce62293f88b10aa8fd41a02;p=elogind.git

diff --git a/rules/rules.d/78-sound-card.rules b/rules/rules.d/78-sound-card.rules
index 1a9cea2b7..0f0cf64d7 100644
--- a/rules/rules.d/78-sound-card.rules
+++ b/rules/rules.d/78-sound-card.rules
@@ -48,8 +48,8 @@ SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_
 
 LABEL="skip_pci"
 
-ENV{ID_SERIAL}=="?*", ENV{ID_IFACE}=="?*", ENV{ID_ID}="$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_IFACE}"
-ENV{ID_SERIAL}=="?*", ENV{ID_IFACE}=="", ENV{ID_ID}="$env{ID_BUS}-$env{ID_SERIAL}"
+ENV{ID_SERIAL}=="?*", ENV{ID_IFACE}=="?*", ENV{ID_ID}="$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_IFACE}-$attr{id}"
+ENV{ID_SERIAL}=="?*", ENV{ID_IFACE}=="", ENV{ID_ID}="$env{ID_BUS}-$env{ID_SERIAL}-$attr{id}"
 
 ENV{ID_PATH}=="", IMPORT{program}="path_id %p/controlC%n"
 
@@ -63,8 +63,9 @@ ATTR{pcmC%nD0p/pcm_class}=="modem", ENV{SOUND_CLASS}="modem", GOTO="sound_end"
 # Identify cards on the internal PCI bus as internal
 SUBSYSTEMS=="pci", DEVPATH=="*/0000:00:??.?/sound/*", ENV{SOUND_FORM_FACTOR}="internal", GOTO="sound_end"
 
-# Recognize good old WinTV cards as TV cards
+# Recognize good old WinTV cards and those based on saa7134 as TV cards
 SUBSYSTEMS=="pci", DRIVERS=="Bt87x", ENV{SOUND_FORM_FACTOR}="tv", GOTO="sound_end"
+SUBSYSTEMS=="pci", DRIVERS=="saa7134", ENV{SOUND_FORM_FACTOR}="tv", GOTO="sound_end"
 
 # Hmm, do we really want this database here?
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="0471", ATTRS{idProduct}=="0311", ENV{SOUND_FORM_FACTOR}="webcam", GOTO="sound_end"