FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-30 15:43:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: fsl: Add .owner to struct snd_soc_card

Browse Source 
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>
This commit is contained in:
Axel Lin 2011-12-22 21:04:54 +08:00 committed by Mark Brown
parent 354a21423d
commit 4c3c5df05e
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sound/soc/fsl/efika-audio-fabric.c
View File

@ -31,8 +31,6 @@
#define DRV_NAME "efika-audio-fabric" #define DRV_NAME "efika-audio-fabric"
static struct snd_soc_card card;
static struct snd_soc_dai_link efika_fabric_dai[] = { static struct snd_soc_dai_link efika_fabric_dai[] = {
{ {
.name = "AC97", .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) static __init int efika_fabric_init(void)
{ {
struct platform_device *pdev; struct platform_device *pdev;
@ -60,11 +65,6 @@ static __init int efika_fabric_init(void)
if (!of_machine_is_compatible("bplan,efika")) if (!of_machine_is_compatible("bplan,efika"))
return -ENODEV; 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); pdev = platform_device_alloc("soc-audio", 1);
if (!pdev) { if (!pdev) {
pr_err("efika_fabric_init: platform_device_alloc() failed\n"); pr_err("efika_fabric_init: platform_device_alloc() failed\n");

14
sound/soc/fsl/pcm030-audio-fabric.c
View File

@ -31,8 +31,6 @@
#define DRV_NAME "pcm030-audio-fabric" #define DRV_NAME "pcm030-audio-fabric"
static struct snd_soc_card card;
static struct snd_soc_dai_link pcm030_fabric_dai[] = { static struct snd_soc_dai_link pcm030_fabric_dai[] = {
{ {
.name = "AC97", .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) static __init int pcm030_fabric_init(void)
{ {
struct platform_device *pdev; struct platform_device *pdev;
@ -60,11 +65,6 @@ static __init int pcm030_fabric_init(void)
if (!of_machine_is_compatible("phytec,pcm030")) if (!of_machine_is_compatible("phytec,pcm030"))
return -ENODEV; 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); pdev = platform_device_alloc("soc-audio", 1);
if (!pdev) { if (!pdev) {
pr_err("pcm030_fabric_init: platform_device_alloc() failed\n"); pr_err("pcm030_fabric_init: platform_device_alloc() failed\n");