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

Commit 567d6f48 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.38' into for-2.6.39

parents 13fd179f 0962bb21

sound/soc/soc-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1518,6 +1518,7 @@ static int soc_post_component_init(struct snd_soc_card *card, 
		rtd = &card->rtd_aux[num];

		name = aux_dev->name;

	}

	rtd->card = card;



	/* machine controls, routes and widgets are not prefixed */

	temp = codec->name_prefix;
@@ -1539,7 +1540,6 @@ static int soc_post_component_init(struct snd_soc_card *card, 


	/* register the rtd device */

	rtd->codec = codec;

	rtd->card = card;

	rtd->dev.parent = card->dev;

	rtd->dev.release = rtd_release;

	rtd->dev.init_name = name;