Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be914cf9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/misc' into for-linus 

* topic/misc:
  ALSA: use card device as parent for jack input-devices
parents 31d496aa 1f3fff7b

sound/core/jack.c

+1 −1
Original line number Diff line number Diff line
@@ -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)