Merge branch 'topic/misc' into for-linus

* topic/misc: ALSA: use card device as parent for jack input-devices
aixiaorenzhe · Jun 12, 2009 · be914cf · be914cf
2 parents 31d496a + 1f3fff7
commit be914cf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)