diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-23 01:53:32 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-23 06:32:07 -0500 |
commit | 4a7042e59908231fc046aac88bd98454d886052d (patch) | |
tree | 34799035a4288be3c32d4b20328b68cb13ab3d67 | |
parent | 23bd1ce48f0b2721f0f37087d8acd9fe57f895d7 (diff) |
ASoC: sh: Add .owner to struct snd_soc_card
Add missing .owner of struct snd_soc_card. This prevents 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>
-rw-r--r-- | sound/soc/sh/fsi-ak4642.c | 1 | ||||
-rw-r--r-- | sound/soc/sh/fsi-da7210.c | 1 | ||||
-rw-r--r-- | sound/soc/sh/fsi-hdmi.c | 1 | ||||
-rw-r--r-- | sound/soc/sh/migor.c | 1 | ||||
-rw-r--r-- | sound/soc/sh/sh7760-ac97.c | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c index eb52778d0f90..97f540aabbdd 100644 --- a/sound/soc/sh/fsi-ak4642.c +++ b/sound/soc/sh/fsi-ak4642.c | |||
@@ -49,6 +49,7 @@ static struct snd_soc_dai_link fsi_dai_link = { | |||
49 | }; | 49 | }; |
50 | 50 | ||
51 | static struct snd_soc_card fsi_soc_card = { | 51 | static struct snd_soc_card fsi_soc_card = { |
52 | .owner = THIS_MODULE, | ||
52 | .dai_link = &fsi_dai_link, | 53 | .dai_link = &fsi_dai_link, |
53 | .num_links = 1, | 54 | .num_links = 1, |
54 | }; | 55 | }; |
diff --git a/sound/soc/sh/fsi-da7210.c b/sound/soc/sh/fsi-da7210.c index f5586b5b0c3b..1dd3354c7411 100644 --- a/sound/soc/sh/fsi-da7210.c +++ b/sound/soc/sh/fsi-da7210.c | |||
@@ -44,6 +44,7 @@ static struct snd_soc_dai_link fsi_da7210_dai = { | |||
44 | 44 | ||
45 | static struct snd_soc_card fsi_soc_card = { | 45 | static struct snd_soc_card fsi_soc_card = { |
46 | .name = "FSI-DA7210", | 46 | .name = "FSI-DA7210", |
47 | .owner = THIS_MODULE, | ||
47 | .dai_link = &fsi_da7210_dai, | 48 | .dai_link = &fsi_da7210_dai, |
48 | .num_links = 1, | 49 | .num_links = 1, |
49 | }; | 50 | }; |
diff --git a/sound/soc/sh/fsi-hdmi.c b/sound/soc/sh/fsi-hdmi.c index 621aea155ac1..6e41908323e8 100644 --- a/sound/soc/sh/fsi-hdmi.c +++ b/sound/soc/sh/fsi-hdmi.c | |||
@@ -39,6 +39,7 @@ static struct snd_soc_dai_link fsi_dai_link = { | |||
39 | }; | 39 | }; |
40 | 40 | ||
41 | static struct snd_soc_card fsi_soc_card = { | 41 | static struct snd_soc_card fsi_soc_card = { |
42 | .owner = THIS_MODULE, | ||
42 | .dai_link = &fsi_dai_link, | 43 | .dai_link = &fsi_dai_link, |
43 | .num_links = 1, | 44 | .num_links = 1, |
44 | }; | 45 | }; |
diff --git a/sound/soc/sh/migor.c b/sound/soc/sh/migor.c index 6088a6a3238a..9d9ad8d61c0a 100644 --- a/sound/soc/sh/migor.c +++ b/sound/soc/sh/migor.c | |||
@@ -164,6 +164,7 @@ static struct snd_soc_dai_link migor_dai = { | |||
164 | /* migor audio machine driver */ | 164 | /* migor audio machine driver */ |
165 | static struct snd_soc_card snd_soc_migor = { | 165 | static struct snd_soc_card snd_soc_migor = { |
166 | .name = "Migo-R", | 166 | .name = "Migo-R", |
167 | .owner = THIS_MODULE, | ||
167 | .dai_link = &migor_dai, | 168 | .dai_link = &migor_dai, |
168 | .num_links = 1, | 169 | .num_links = 1, |
169 | }; | 170 | }; |
diff --git a/sound/soc/sh/sh7760-ac97.c b/sound/soc/sh/sh7760-ac97.c index df651e8e38de..4a3568a9bf59 100644 --- a/sound/soc/sh/sh7760-ac97.c +++ b/sound/soc/sh/sh7760-ac97.c | |||
@@ -28,6 +28,7 @@ static struct snd_soc_dai_link sh7760_ac97_dai = { | |||
28 | 28 | ||
29 | static struct snd_soc_card sh7760_ac97_soc_machine = { | 29 | static struct snd_soc_card sh7760_ac97_soc_machine = { |
30 | .name = "SH7760 AC97", | 30 | .name = "SH7760 AC97", |
31 | .owner = THIS_MODULE, | ||
31 | .dai_link = &sh7760_ac97_dai, | 32 | .dai_link = &sh7760_ac97_dai, |
32 | .num_links = 1, | 33 | .num_links = 1, |
33 | }; | 34 | }; |