diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-12 14:03:13 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-12 14:03:13 -0400 |
| commit | be914cf91086ca7be9216a894cba0999ddbf541d (patch) | |
| tree | f4bc2f8d71dbe702c55aa3dd0c45d01ca61b6d21 /sound/core | |
| 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
Diffstat (limited to 'sound/core')
| -rw-r--r-- | sound/core/jack.c | 2 |
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) | |||
| 63 | 63 | ||
| 64 | /* Default to the sound card device. */ | 64 | /* Default to the sound card device. */ |
| 65 | if (!jack->input_dev->dev.parent) | 65 | if (!jack->input_dev->dev.parent) |
| 66 | jack->input_dev->dev.parent = card->dev; | 66 | jack->input_dev->dev.parent = snd_card_get_device_link(card); |
| 67 | 67 | ||
| 68 | err = input_register_device(jack->input_dev); | 68 | err = input_register_device(jack->input_dev); |
| 69 | if (err == 0) | 69 | if (err == 0) |