| commit | be914cf91086ca7be9216a894cba0999ddbf541d | [log] [tgz] |
|---|---|---|
| author | Takashi Iwai <tiwai@suse.de> | Fri Jun 12 20:03:13 2009 +0200 |
| committer | Takashi Iwai <tiwai@suse.de> | Fri Jun 12 20:03:13 2009 +0200 |
| tree | f4bc2f8d71dbe702c55aa3dd0c45d01ca61b6d21 | |
| parent | 31d496aaee1dad6ac63770035793032f2062e336 [diff] | |
| parent | 1f3fff7bda95b75a6be5a02c2a6902573d8c18e6 [diff] |
Merge branch 'topic/misc' into for-linus * topic/misc: ALSA: use card device as parent for jack input-devices
diff --git a/sound/core/jack.c b/sound/core/jack.c index d54d1a0..f705eec 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c
@@ -63,7 +63,7 @@ /* 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)