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

Commit 4c3c5df0 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: fsl: 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: default avatarLothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 354a2142

sound/soc/fsl/efika-audio-fabric.c

+7 −7
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 


#define DRV_NAME "efika-audio-fabric"



static struct snd_soc_card card;



static struct snd_soc_dai_link efika_fabric_dai[] = {

{

	.name = "AC97",
@@ -52,6 +50,13 @@ static struct snd_soc_dai_link efika_fabric_dai[] = { 
},

};



static struct snd_soc_card card = {

	.name = "Efika",

	.owner = THIS_MODULE,

	.dai_link = efika_fabric_dai,

	.num_links = ARRAY_SIZE(efika_fabric_dai),

};



static __init int efika_fabric_init(void)

{

	struct platform_device *pdev;
@@ -60,11 +65,6 @@ static __init int efika_fabric_init(void) 
	if (!of_machine_is_compatible("bplan,efika"))

		return -ENODEV;



	card.name = "Efika";

	card.dai_link = efika_fabric_dai;

	card.num_links = ARRAY_SIZE(efika_fabric_dai);





	pdev = platform_device_alloc("soc-audio", 1);

	if (!pdev) {

		pr_err("efika_fabric_init: platform_device_alloc() failed\n");

sound/soc/fsl/pcm030-audio-fabric.c

+7 −7
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ 


#define DRV_NAME "pcm030-audio-fabric"



static struct snd_soc_card card;



static struct snd_soc_dai_link pcm030_fabric_dai[] = {

{

	.name = "AC97",
@@ -52,6 +50,13 @@ static struct snd_soc_dai_link pcm030_fabric_dai[] = { 
},

};



static struct snd_soc_card card = {

	.name = "pcm030",

	.owner = THIS_MODULE,

	.dai_link = pcm030_fabric_dai,

	.num_links = ARRAY_SIZE(pcm030_fabric_dai),

};



static __init int pcm030_fabric_init(void)

{

	struct platform_device *pdev;
@@ -60,11 +65,6 @@ static __init int pcm030_fabric_init(void) 
	if (!of_machine_is_compatible("phytec,pcm030"))

		return -ENODEV;





	card.name = "pcm030";

	card.dai_link = pcm030_fabric_dai;

	card.num_links = ARRAY_SIZE(pcm030_fabric_dai);



	pdev = platform_device_alloc("soc-audio", 1);

	if (!pdev) {

		pr_err("pcm030_fabric_init: platform_device_alloc() failed\n");