Commit 1f3fff7bda95b75a6be5a02c2a6902573d8c18e6
Committed by
Takashi Iwai
Takashi Iwai
1 parent
ad0b0822f9
Exists in
master
and in
7 other branches
ALSA: use card device as parent for jack input-devices
This moves the jack devices from the PCI device into the ALSA card device, which makes it easier for userspace to find all devices belonging to a specific card while granting access to logged-in users. Jack input devices from sound cards can now simply be matched with udev by doing: SUBSYSTEM="input", SUBSYSTEMS="sound", ... ls -l /sys/devices/pci0000:00/0000:00:1b.0/sound/card0 controlC0 device -> ../../../0000:00:1b.0 id input10 input11 input8 input9 number pcmC0D0c pcmC0D0p pcmC0D1p power subsystem -> ../../../../../class/sound uevent Cc: Lennart Poettering <lennart@0pointer.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff
sound/core/jack.c
| ... | ... | @@ -63,7 +63,7 @@ |
| 63 | 63 | |
| 64 | 64 | /* Default to the sound card device. */ |
| 65 | 65 | if (!jack->input_dev->dev.parent) |
| 66 | - jack->input_dev->dev.parent = card->dev; | |
| 66 | + jack->input_dev->dev.parent = snd_card_get_device_link(card); | |
| 67 | 67 | |
| 68 | 68 | err = input_register_device(jack->input_dev); |
| 69 | 69 | if (err == 0) |