diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-21 22:08:59 -0500 |
---|---|---|
committer | Liam Girdwood <lrg@ti.com> | 2011-12-23 13:13:01 -0500 |
commit | b425b88418e302caf27e9cf44aa987b83c04cb2d (patch) | |
tree | 1566618f56953e501b0aa5067510a4ddde63cd45 /sound/soc | |
parent | c5cf4dbc7f804bb4ff02a065b927bd8688204253 (diff) |
ASoC: omap: 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>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/omap/am3517evm.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/ams-delta.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/igep0020.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/n810.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/omap3evm.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/omap3pandora.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/omap4-hdmi-card.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/osk5912.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/overo.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/rx51.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/sdp3430.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/sdp4430.c | 1 | ||||
-rw-r--r-- | sound/soc/omap/zoom2.c | 1 |
13 files changed, 13 insertions, 0 deletions
diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c index c1cd4a0cbe9e..add4866d7e67 100644 --- a/sound/soc/omap/am3517evm.c +++ b/sound/soc/omap/am3517evm.c | |||
@@ -107,6 +107,7 @@ static struct snd_soc_dai_link am3517evm_dai = { | |||
107 | /* Audio machine driver */ | 107 | /* Audio machine driver */ |
108 | static struct snd_soc_card snd_soc_am3517evm = { | 108 | static struct snd_soc_card snd_soc_am3517evm = { |
109 | .name = "am3517evm", | 109 | .name = "am3517evm", |
110 | .owner = THIS_MODULE, | ||
110 | .dai_link = &am3517evm_dai, | 111 | .dai_link = &am3517evm_dai, |
111 | .num_links = 1, | 112 | .num_links = 1, |
112 | 113 | ||
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index a04a4338fdac..3e523a7a9efb 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c | |||
@@ -597,6 +597,7 @@ static struct snd_soc_dai_link ams_delta_dai_link = { | |||
597 | /* Audio card driver */ | 597 | /* Audio card driver */ |
598 | static struct snd_soc_card ams_delta_audio_card = { | 598 | static struct snd_soc_card ams_delta_audio_card = { |
599 | .name = "AMS_DELTA", | 599 | .name = "AMS_DELTA", |
600 | .owner = THIS_MODULE, | ||
600 | .dai_link = &ams_delta_dai_link, | 601 | .dai_link = &ams_delta_dai_link, |
601 | .num_links = 1, | 602 | .num_links = 1, |
602 | .set_bias_level = ams_delta_set_bias_level, | 603 | .set_bias_level = ams_delta_set_bias_level, |
diff --git a/sound/soc/omap/igep0020.c b/sound/soc/omap/igep0020.c index 591fbf8f7cd9..ccae58a1339c 100644 --- a/sound/soc/omap/igep0020.c +++ b/sound/soc/omap/igep0020.c | |||
@@ -72,6 +72,7 @@ static struct snd_soc_dai_link igep2_dai = { | |||
72 | /* Audio machine driver */ | 72 | /* Audio machine driver */ |
73 | static struct snd_soc_card snd_soc_card_igep2 = { | 73 | static struct snd_soc_card snd_soc_card_igep2 = { |
74 | .name = "igep2", | 74 | .name = "igep2", |
75 | .owner = THIS_MODULE, | ||
75 | .dai_link = &igep2_dai, | 76 | .dai_link = &igep2_dai, |
76 | .num_links = 1, | 77 | .num_links = 1, |
77 | }; | 78 | }; |
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index fc6209b3f20c..597be412f1e4 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c | |||
@@ -289,6 +289,7 @@ static struct snd_soc_dai_link n810_dai = { | |||
289 | /* Audio machine driver */ | 289 | /* Audio machine driver */ |
290 | static struct snd_soc_card snd_soc_n810 = { | 290 | static struct snd_soc_card snd_soc_n810 = { |
291 | .name = "N810", | 291 | .name = "N810", |
292 | .owner = THIS_MODULE, | ||
292 | .dai_link = &n810_dai, | 293 | .dai_link = &n810_dai, |
293 | .num_links = 1, | 294 | .num_links = 1, |
294 | 295 | ||
diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c index 68578959e4aa..071fcb09b8b2 100644 --- a/sound/soc/omap/omap3evm.c +++ b/sound/soc/omap/omap3evm.c | |||
@@ -70,6 +70,7 @@ static struct snd_soc_dai_link omap3evm_dai = { | |||
70 | /* Audio machine driver */ | 70 | /* Audio machine driver */ |
71 | static struct snd_soc_card snd_soc_omap3evm = { | 71 | static struct snd_soc_card snd_soc_omap3evm = { |
72 | .name = "omap3evm", | 72 | .name = "omap3evm", |
73 | .owner = THIS_MODULE, | ||
73 | .dai_link = &omap3evm_dai, | 74 | .dai_link = &omap3evm_dai, |
74 | .num_links = 1, | 75 | .num_links = 1, |
75 | }; | 76 | }; |
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index 7605c37c91e7..07794bd10952 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c | |||
@@ -233,6 +233,7 @@ static struct snd_soc_dai_link omap3pandora_dai[] = { | |||
233 | /* SoC card */ | 233 | /* SoC card */ |
234 | static struct snd_soc_card snd_soc_card_omap3pandora = { | 234 | static struct snd_soc_card snd_soc_card_omap3pandora = { |
235 | .name = "omap3pandora", | 235 | .name = "omap3pandora", |
236 | .owner = THIS_MODULE, | ||
236 | .dai_link = omap3pandora_dai, | 237 | .dai_link = omap3pandora_dai, |
237 | .num_links = ARRAY_SIZE(omap3pandora_dai), | 238 | .num_links = ARRAY_SIZE(omap3pandora_dai), |
238 | }; | 239 | }; |
diff --git a/sound/soc/omap/omap4-hdmi-card.c b/sound/soc/omap/omap4-hdmi-card.c index 52d471c1eeed..28d689b2714d 100644 --- a/sound/soc/omap/omap4-hdmi-card.c +++ b/sound/soc/omap/omap4-hdmi-card.c | |||
@@ -74,6 +74,7 @@ static struct snd_soc_dai_link omap4_hdmi_dai = { | |||
74 | 74 | ||
75 | static struct snd_soc_card snd_soc_omap4_hdmi = { | 75 | static struct snd_soc_card snd_soc_omap4_hdmi = { |
76 | .name = "OMAP4HDMI", | 76 | .name = "OMAP4HDMI", |
77 | .owner = THIS_MODULE, | ||
77 | .dai_link = &omap4_hdmi_dai, | 78 | .dai_link = &omap4_hdmi_dai, |
78 | .num_links = 1, | 79 | .num_links = 1, |
79 | }; | 80 | }; |
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c index 351ec9db384d..d859b597e7ec 100644 --- a/sound/soc/omap/osk5912.c +++ b/sound/soc/omap/osk5912.c | |||
@@ -108,6 +108,7 @@ static struct snd_soc_dai_link osk_dai = { | |||
108 | /* Audio machine driver */ | 108 | /* Audio machine driver */ |
109 | static struct snd_soc_card snd_soc_card_osk = { | 109 | static struct snd_soc_card snd_soc_card_osk = { |
110 | .name = "OSK5912", | 110 | .name = "OSK5912", |
111 | .owner = THIS_MODULE, | ||
111 | .dai_link = &osk_dai, | 112 | .dai_link = &osk_dai, |
112 | .num_links = 1, | 113 | .num_links = 1, |
113 | 114 | ||
diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index c3550aeee533..2ee889c50256 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c | |||
@@ -72,6 +72,7 @@ static struct snd_soc_dai_link overo_dai = { | |||
72 | /* Audio machine driver */ | 72 | /* Audio machine driver */ |
73 | static struct snd_soc_card snd_soc_card_overo = { | 73 | static struct snd_soc_card snd_soc_card_overo = { |
74 | .name = "overo", | 74 | .name = "overo", |
75 | .owner = THIS_MODULE, | ||
75 | .dai_link = &overo_dai, | 76 | .dai_link = &overo_dai, |
76 | .num_links = 1, | 77 | .num_links = 1, |
77 | }; | 78 | }; |
diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c index ad16db536320..fada6ef43eea 100644 --- a/sound/soc/omap/rx51.c +++ b/sound/soc/omap/rx51.c | |||
@@ -383,6 +383,7 @@ static struct snd_soc_codec_conf rx51_codec_conf[] = { | |||
383 | /* Audio card */ | 383 | /* Audio card */ |
384 | static struct snd_soc_card rx51_sound_card = { | 384 | static struct snd_soc_card rx51_sound_card = { |
385 | .name = "RX-51", | 385 | .name = "RX-51", |
386 | .owner = THIS_MODULE, | ||
386 | .dai_link = rx51_dai, | 387 | .dai_link = rx51_dai, |
387 | .num_links = ARRAY_SIZE(rx51_dai), | 388 | .num_links = ARRAY_SIZE(rx51_dai), |
388 | .aux_dev = rx51_aux_dev, | 389 | .aux_dev = rx51_aux_dev, |
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index e8fbf8efdbb8..2c850662ea7e 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c | |||
@@ -213,6 +213,7 @@ static struct snd_soc_dai_link sdp3430_dai[] = { | |||
213 | /* Audio machine driver */ | 213 | /* Audio machine driver */ |
214 | static struct snd_soc_card snd_soc_sdp3430 = { | 214 | static struct snd_soc_card snd_soc_sdp3430 = { |
215 | .name = "SDP3430", | 215 | .name = "SDP3430", |
216 | .owner = THIS_MODULE, | ||
216 | .dai_link = sdp3430_dai, | 217 | .dai_link = sdp3430_dai, |
217 | .num_links = ARRAY_SIZE(sdp3430_dai), | 218 | .num_links = ARRAY_SIZE(sdp3430_dai), |
218 | 219 | ||
diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c index 2735fa03b74b..175ba9a04edf 100644 --- a/sound/soc/omap/sdp4430.c +++ b/sound/soc/omap/sdp4430.c | |||
@@ -226,6 +226,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { | |||
226 | /* Audio machine driver */ | 226 | /* Audio machine driver */ |
227 | static struct snd_soc_card snd_soc_sdp4430 = { | 227 | static struct snd_soc_card snd_soc_sdp4430 = { |
228 | .name = "SDP4430", | 228 | .name = "SDP4430", |
229 | .owner = THIS_MODULE, | ||
229 | .dai_link = sdp4430_dai, | 230 | .dai_link = sdp4430_dai, |
230 | .num_links = ARRAY_SIZE(sdp4430_dai), | 231 | .num_links = ARRAY_SIZE(sdp4430_dai), |
231 | 232 | ||
diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c index 7641a7fa8f97..981616d61f67 100644 --- a/sound/soc/omap/zoom2.c +++ b/sound/soc/omap/zoom2.c | |||
@@ -157,6 +157,7 @@ static struct snd_soc_dai_link zoom2_dai[] = { | |||
157 | /* Audio machine driver */ | 157 | /* Audio machine driver */ |
158 | static struct snd_soc_card snd_soc_zoom2 = { | 158 | static struct snd_soc_card snd_soc_zoom2 = { |
159 | .name = "Zoom2", | 159 | .name = "Zoom2", |
160 | .owner = THIS_MODULE, | ||
160 | .dai_link = zoom2_dai, | 161 | .dai_link = zoom2_dai, |
161 | .num_links = ARRAY_SIZE(zoom2_dai), | 162 | .num_links = ARRAY_SIZE(zoom2_dai), |
162 | 163 | ||