renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-19 16:14:13 +08:00
Code

Merge branch 'topic/misc' into for-linus

Browse Source 
* topic/misc:
  ALSA: use card device as parent for jack input-devices
This commit is contained in:
Takashi Iwai 2009-06-12 20:03:13 +02:00
commit be914cf910
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/core/jack.c
View File

@ -63,7 +63,7 @@ static int snd_jack_dev_register(struct snd_device *device)
/* Default to the sound card device. */ /* Default to the sound card device. */
if (!jack->input_dev->dev.parent) if (!jack->input_dev->dev.parent)
jack->input_dev->dev.parent = card->dev; jack->input_dev->dev.parent = snd_card_get_device_link(card);
err = input_register_device(jack->input_dev); err = input_register_device(jack->input_dev);
if (err == 0) if (err == 0)