summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-06-12 20:03:13 +0200
committerTakashi Iwai <tiwai@suse.de>2009-06-12 20:03:13 +0200
commitbe914cf91086ca7be9216a894cba0999ddbf541d (patch)
treef4bc2f8d71dbe702c55aa3dd0c45d01ca61b6d21 /sound
parent31d496aaee1dad6ac63770035793032f2062e336 (diff)
parent1f3fff7bda95b75a6be5a02c2a6902573d8c18e6 (diff)
downloadlinux-be914cf91086ca7be9216a894cba0999ddbf541d.tar.bz2
Merge branch 'topic/misc' into for-linus
* topic/misc: ALSA: use card device as parent for jack input-devices
Diffstat (limited to 'sound')
-rw-r--r--sound/core/jack.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/jack.c b/sound/core/jack.c
index d54d1a05fe65..f705eec7372a 100644
--- 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)