Merge branch 'topic/misc' into for-linus

* topic/misc:
  ALSA: use card device as parent for jack input-devices
This commit is contained in:
Takashi Iwai 2009-06-12 20:03:13 +02:00
commit be914cf910

View file

@ -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)