Merge branch 'topic/misc' into for-linus

* topic/misc: ALSA: use card device as parent for jack input-devices

Merge branch 'topic/misc' into for-linus
* topic/misc: ALSA: use card device as parent for jack input-devices
be914cf9 · Takashi Iwai · 31d496aa · 1f3fff7b · be914cf9
Commit be914cf9 authored Jun 12, 2009 by Takashi Iwai
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sound/core/jack.c sound/core/jack.c +1 -1

No files found.
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -63,7 +63,7 @@ static int snd_jack_dev_register(struct snd_device *device)
 	/* Default to the sound card device. */
 	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);
 	if (err == 0)