summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-11-05 04:32:41 +0100
committerLennart Poettering <lennart@poettering.net>2009-11-05 04:32:41 +0100
commited1b2d9fc7d5c5bfe2a67b0b8ff9e5ea8694268e (patch)
tree2dbf93a9c1559cb17c29f4e59ebe0cf3555b77f8 /rules
parent081be002eae9bc7fc03dbfd7b99b4d28a7c98f9d (diff)
sound: include ALSA sound card id in ID_ID property
If two USB sound cards that have the same serial number are plugged in make sure ID_ID is unique at least during runtime, by including the ALSA card id in the ID_ID string. Fixes issues like this one: http://pulseaudio.org/ticket/661
Diffstat (limited to 'rules')
-rw-r--r--rules/rules.d/78-sound-card.rules4
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/rules.d/78-sound-card.rules b/rules/rules.d/78-sound-card.rules
index f40921d9d1..0f0cf64d7c 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"