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

Commit 561c6a17 authored Dec 22, 2011 by Axel Lin Committed by Mark Brown Dec 22, 2011

ASoC: pxa: Add .owner to struct snd_soc_card



Missed .owner of struct snd_soc_card will prevent the module from being
removed from underneath its users.

Reported-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

parent 5a504963

sound/soc/pxa/corgi.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -317,6 +317,7 @@ static struct snd_soc_dai_link corgi_dai = {
	/* corgi audio machine driver */		/* corgi audio machine driver */
	static struct snd_soc_card snd_soc_corgi = {		static struct snd_soc_card snd_soc_corgi = {
	.name = "Corgi",		.name = "Corgi",
			.owner = THIS_MODULE,
	.dai_link = &corgi_dai,		.dai_link = &corgi_dai,
	.num_links = 1,		.num_links = 1,
	};		};

sound/soc/pxa/e740_wm9705.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -133,6 +133,7 @@ static struct snd_soc_dai_link e740_dai[] = {

	static struct snd_soc_card e740 = {		static struct snd_soc_card e740 = {
	.name = "Toshiba e740",		.name = "Toshiba e740",
			.owner = THIS_MODULE,
	.dai_link = e740_dai,		.dai_link = e740_dai,
	.num_links = ARRAY_SIZE(e740_dai),		.num_links = ARRAY_SIZE(e740_dai),
	};		};

sound/soc/pxa/e750_wm9705.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -116,6 +116,7 @@ static struct snd_soc_dai_link e750_dai[] = {

	static struct snd_soc_card e750 = {		static struct snd_soc_card e750 = {
	.name = "Toshiba e750",		.name = "Toshiba e750",
			.owner = THIS_MODULE,
	.dai_link = e750_dai,		.dai_link = e750_dai,
	.num_links = ARRAY_SIZE(e750_dai),		.num_links = ARRAY_SIZE(e750_dai),
	};		};

sound/soc/pxa/e800_wm9712.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -106,6 +106,7 @@ static struct snd_soc_dai_link e800_dai[] = {

	static struct snd_soc_card e800 = {		static struct snd_soc_card e800 = {
	.name = "Toshiba e800",		.name = "Toshiba e800",
			.owner = THIS_MODULE,
	.dai_link = e800_dai,		.dai_link = e800_dai,
	.num_links = ARRAY_SIZE(e800_dai),		.num_links = ARRAY_SIZE(e800_dai),
	};		};

sound/soc/pxa/em-x270.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -54,6 +54,7 @@ static struct snd_soc_dai_link em_x270_dai[] = {

	static struct snd_soc_card em_x270 = {		static struct snd_soc_card em_x270 = {
	.name = "EM-X270",		.name = "EM-X270",
			.owner = THIS_MODULE,
	.dai_link = em_x270_dai,		.dai_link = em_x270_dai,
	.num_links = ARRAY_SIZE(em_x270_dai),		.num_links = ARRAY_SIZE(em_x270_dai),
	};		};