diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-12-21 20:44:43 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-22 06:04:18 -0500 |
commit | 561c6a172f065fa918d0ff3cecdca1b22dca893f (patch) | |
tree | 64f76d1539b2d14cd7084bd293ba11d4f86cc803 /sound/soc | |
parent | 5a5049637cf08c4c17805be679c19544bb27fb92 (diff) |
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>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/pxa/corgi.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/e740_wm9705.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/e750_wm9705.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/e800_wm9712.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/em-x270.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/hx4700.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/imote2.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/magician.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/mioa701_wm9713.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/palm27x.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/raumfeld.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/saarb.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/spitz.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/tavorevb3.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/tosa.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/z2.c | 1 | ||||
-rw-r--r-- | sound/soc/pxa/zylonite.c | 1 |
17 files changed, 18 insertions, 0 deletions
diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c index b0e2fb720910..5e5004a84073 100644 --- a/sound/soc/pxa/corgi.c +++ b/sound/soc/pxa/corgi.c | |||
@@ -317,6 +317,7 @@ static struct snd_soc_dai_link corgi_dai = { | |||
317 | /* corgi audio machine driver */ | 317 | /* corgi audio machine driver */ |
318 | static struct snd_soc_card snd_soc_corgi = { | 318 | static struct snd_soc_card snd_soc_corgi = { |
319 | .name = "Corgi", | 319 | .name = "Corgi", |
320 | .owner = THIS_MODULE, | ||
320 | .dai_link = &corgi_dai, | 321 | .dai_link = &corgi_dai, |
321 | .num_links = 1, | 322 | .num_links = 1, |
322 | }; | 323 | }; |
diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c index 203ab78a4d68..7b1bc2390039 100644 --- a/sound/soc/pxa/e740_wm9705.c +++ b/sound/soc/pxa/e740_wm9705.c | |||
@@ -133,6 +133,7 @@ static struct snd_soc_dai_link e740_dai[] = { | |||
133 | 133 | ||
134 | static struct snd_soc_card e740 = { | 134 | static struct snd_soc_card e740 = { |
135 | .name = "Toshiba e740", | 135 | .name = "Toshiba e740", |
136 | .owner = THIS_MODULE, | ||
136 | .dai_link = e740_dai, | 137 | .dai_link = e740_dai, |
137 | .num_links = ARRAY_SIZE(e740_dai), | 138 | .num_links = ARRAY_SIZE(e740_dai), |
138 | }; | 139 | }; |
diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c index 27f90cc44234..47b89d71e287 100644 --- a/sound/soc/pxa/e750_wm9705.c +++ b/sound/soc/pxa/e750_wm9705.c | |||
@@ -116,6 +116,7 @@ static struct snd_soc_dai_link e750_dai[] = { | |||
116 | 116 | ||
117 | static struct snd_soc_card e750 = { | 117 | static struct snd_soc_card e750 = { |
118 | .name = "Toshiba e750", | 118 | .name = "Toshiba e750", |
119 | .owner = THIS_MODULE, | ||
119 | .dai_link = e750_dai, | 120 | .dai_link = e750_dai, |
120 | .num_links = ARRAY_SIZE(e750_dai), | 121 | .num_links = ARRAY_SIZE(e750_dai), |
121 | }; | 122 | }; |
diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c index 858bf94160c5..ea9707ec6f28 100644 --- a/sound/soc/pxa/e800_wm9712.c +++ b/sound/soc/pxa/e800_wm9712.c | |||
@@ -106,6 +106,7 @@ static struct snd_soc_dai_link e800_dai[] = { | |||
106 | 106 | ||
107 | static struct snd_soc_card e800 = { | 107 | static struct snd_soc_card e800 = { |
108 | .name = "Toshiba e800", | 108 | .name = "Toshiba e800", |
109 | .owner = THIS_MODULE, | ||
109 | .dai_link = e800_dai, | 110 | .dai_link = e800_dai, |
110 | .num_links = ARRAY_SIZE(e800_dai), | 111 | .num_links = ARRAY_SIZE(e800_dai), |
111 | }; | 112 | }; |
diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c index b13a4252812d..64743a05aeae 100644 --- a/sound/soc/pxa/em-x270.c +++ b/sound/soc/pxa/em-x270.c | |||
@@ -54,6 +54,7 @@ static struct snd_soc_dai_link em_x270_dai[] = { | |||
54 | 54 | ||
55 | static struct snd_soc_card em_x270 = { | 55 | static struct snd_soc_card em_x270 = { |
56 | .name = "EM-X270", | 56 | .name = "EM-X270", |
57 | .owner = THIS_MODULE, | ||
57 | .dai_link = em_x270_dai, | 58 | .dai_link = em_x270_dai, |
58 | .num_links = ARRAY_SIZE(em_x270_dai), | 59 | .num_links = ARRAY_SIZE(em_x270_dai), |
59 | }; | 60 | }; |
diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c index 8260207818a5..2a342c92d829 100644 --- a/sound/soc/pxa/hx4700.c +++ b/sound/soc/pxa/hx4700.c | |||
@@ -169,6 +169,7 @@ static struct snd_soc_dai_link hx4700_dai = { | |||
169 | /* hx4700 audio machine driver */ | 169 | /* hx4700 audio machine driver */ |
170 | static struct snd_soc_card snd_soc_card_hx4700 = { | 170 | static struct snd_soc_card snd_soc_card_hx4700 = { |
171 | .name = "iPAQ hx4700", | 171 | .name = "iPAQ hx4700", |
172 | .owner = THIS_MODULE, | ||
172 | .dai_link = &hx4700_dai, | 173 | .dai_link = &hx4700_dai, |
173 | .num_links = 1, | 174 | .num_links = 1, |
174 | .dapm_widgets = hx4700_dapm_widgets, | 175 | .dapm_widgets = hx4700_dapm_widgets, |
diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c index dc905aec6294..b93dafd32b80 100644 --- a/sound/soc/pxa/imote2.c +++ b/sound/soc/pxa/imote2.c | |||
@@ -60,6 +60,7 @@ static struct snd_soc_dai_link imote2_dai = { | |||
60 | 60 | ||
61 | static struct snd_soc_card imote2 = { | 61 | static struct snd_soc_card imote2 = { |
62 | .name = "Imote2", | 62 | .name = "Imote2", |
63 | .owner = THIS_MODULE, | ||
63 | .dai_link = &imote2_dai, | 64 | .dai_link = &imote2_dai, |
64 | .num_links = 1, | 65 | .num_links = 1, |
65 | }; | 66 | }; |
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index e79f516c400e..3f7a8ecb9720 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c | |||
@@ -452,6 +452,7 @@ static struct snd_soc_dai_link magician_dai[] = { | |||
452 | /* magician audio machine driver */ | 452 | /* magician audio machine driver */ |
453 | static struct snd_soc_card snd_soc_card_magician = { | 453 | static struct snd_soc_card snd_soc_card_magician = { |
454 | .name = "Magician", | 454 | .name = "Magician", |
455 | .owner = THIS_MODULE, | ||
455 | .dai_link = magician_dai, | 456 | .dai_link = magician_dai, |
456 | .num_links = ARRAY_SIZE(magician_dai), | 457 | .num_links = ARRAY_SIZE(magician_dai), |
457 | 458 | ||
diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c index 0e73a7f718e4..9c585af59b5f 100644 --- a/sound/soc/pxa/mioa701_wm9713.c +++ b/sound/soc/pxa/mioa701_wm9713.c | |||
@@ -181,6 +181,7 @@ static struct snd_soc_dai_link mioa701_dai[] = { | |||
181 | 181 | ||
182 | static struct snd_soc_card mioa701 = { | 182 | static struct snd_soc_card mioa701 = { |
183 | .name = "MioA701", | 183 | .name = "MioA701", |
184 | .owner = THIS_MODULE, | ||
184 | .dai_link = mioa701_dai, | 185 | .dai_link = mioa701_dai, |
185 | .num_links = ARRAY_SIZE(mioa701_dai), | 186 | .num_links = ARRAY_SIZE(mioa701_dai), |
186 | }; | 187 | }; |
diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c index f313eca40fdc..db24bc685bd3 100644 --- a/sound/soc/pxa/palm27x.c +++ b/sound/soc/pxa/palm27x.c | |||
@@ -146,6 +146,7 @@ static struct snd_soc_dai_link palm27x_dai[] = { | |||
146 | 146 | ||
147 | static struct snd_soc_card palm27x_asoc = { | 147 | static struct snd_soc_card palm27x_asoc = { |
148 | .name = "Palm/PXA27x", | 148 | .name = "Palm/PXA27x", |
149 | .owner = THIS_MODULE, | ||
149 | .dai_link = palm27x_dai, | 150 | .dai_link = palm27x_dai, |
150 | .num_links = ARRAY_SIZE(palm27x_dai), | 151 | .num_links = ARRAY_SIZE(palm27x_dai), |
151 | }; | 152 | }; |
diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c index b899a3bc8f42..ba1545188ec6 100644 --- a/sound/soc/pxa/raumfeld.c +++ b/sound/soc/pxa/raumfeld.c | |||
@@ -260,6 +260,7 @@ static struct snd_soc_dai_link snd_soc_raumfeld_speaker_dai[] = | |||
260 | 260 | ||
261 | static struct snd_soc_card snd_soc_raumfeld_connector = { | 261 | static struct snd_soc_card snd_soc_raumfeld_connector = { |
262 | .name = "Raumfeld Connector", | 262 | .name = "Raumfeld Connector", |
263 | .owner = THIS_MODULE, | ||
263 | .dai_link = snd_soc_raumfeld_connector_dai, | 264 | .dai_link = snd_soc_raumfeld_connector_dai, |
264 | .num_links = ARRAY_SIZE(snd_soc_raumfeld_connector_dai), | 265 | .num_links = ARRAY_SIZE(snd_soc_raumfeld_connector_dai), |
265 | .suspend_post = raumfeld_analog_suspend, | 266 | .suspend_post = raumfeld_analog_suspend, |
@@ -268,6 +269,7 @@ static struct snd_soc_card snd_soc_raumfeld_connector = { | |||
268 | 269 | ||
269 | static struct snd_soc_card snd_soc_raumfeld_speaker = { | 270 | static struct snd_soc_card snd_soc_raumfeld_speaker = { |
270 | .name = "Raumfeld Speaker", | 271 | .name = "Raumfeld Speaker", |
272 | .owner = THIS_MODULE, | ||
271 | .dai_link = snd_soc_raumfeld_speaker_dai, | 273 | .dai_link = snd_soc_raumfeld_speaker_dai, |
272 | .num_links = ARRAY_SIZE(snd_soc_raumfeld_speaker_dai), | 274 | .num_links = ARRAY_SIZE(snd_soc_raumfeld_speaker_dai), |
273 | .suspend_post = raumfeld_analog_suspend, | 275 | .suspend_post = raumfeld_analog_suspend, |
diff --git a/sound/soc/pxa/saarb.c b/sound/soc/pxa/saarb.c index d9467a2c6de0..2e21712cec67 100644 --- a/sound/soc/pxa/saarb.c +++ b/sound/soc/pxa/saarb.c | |||
@@ -125,6 +125,7 @@ static struct snd_soc_dai_link saarb_dai[] = { | |||
125 | 125 | ||
126 | static struct snd_soc_card snd_soc_card_saarb = { | 126 | static struct snd_soc_card snd_soc_card_saarb = { |
127 | .name = "Saarb", | 127 | .name = "Saarb", |
128 | .owner = THIS_MODULE, | ||
128 | .dai_link = saarb_dai, | 129 | .dai_link = saarb_dai, |
129 | .num_links = ARRAY_SIZE(saarb_dai), | 130 | .num_links = ARRAY_SIZE(saarb_dai), |
130 | }; | 131 | }; |
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index c2d6ff9b1588..bb060482c00d 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c | |||
@@ -319,6 +319,7 @@ static struct snd_soc_dai_link spitz_dai = { | |||
319 | /* spitz audio machine driver */ | 319 | /* spitz audio machine driver */ |
320 | static struct snd_soc_card snd_soc_spitz = { | 320 | static struct snd_soc_card snd_soc_spitz = { |
321 | .name = "Spitz", | 321 | .name = "Spitz", |
322 | .owner = THIS_MODULE, | ||
322 | .dai_link = &spitz_dai, | 323 | .dai_link = &spitz_dai, |
323 | .num_links = 1, | 324 | .num_links = 1, |
324 | }; | 325 | }; |
diff --git a/sound/soc/pxa/tavorevb3.c b/sound/soc/pxa/tavorevb3.c index eeec892e0e04..4bef12cd424d 100644 --- a/sound/soc/pxa/tavorevb3.c +++ b/sound/soc/pxa/tavorevb3.c | |||
@@ -125,6 +125,7 @@ static struct snd_soc_dai_link evb3_dai[] = { | |||
125 | 125 | ||
126 | static struct snd_soc_card snd_soc_card_evb3 = { | 126 | static struct snd_soc_card snd_soc_card_evb3 = { |
127 | .name = "Tavor EVB3", | 127 | .name = "Tavor EVB3", |
128 | .owner = THIS_MODULE, | ||
128 | .dai_link = evb3_dai, | 129 | .dai_link = evb3_dai, |
129 | .num_links = ARRAY_SIZE(evb3_dai), | 130 | .num_links = ARRAY_SIZE(evb3_dai), |
130 | }; | 131 | }; |
diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c index 3f394de297a2..564ef08a89f2 100644 --- a/sound/soc/pxa/tosa.c +++ b/sound/soc/pxa/tosa.c | |||
@@ -236,6 +236,7 @@ static struct snd_soc_dai_link tosa_dai[] = { | |||
236 | 236 | ||
237 | static struct snd_soc_card tosa = { | 237 | static struct snd_soc_card tosa = { |
238 | .name = "Tosa", | 238 | .name = "Tosa", |
239 | .owner = THIS_MODULE, | ||
239 | .dai_link = tosa_dai, | 240 | .dai_link = tosa_dai, |
240 | .num_links = ARRAY_SIZE(tosa_dai), | 241 | .num_links = ARRAY_SIZE(tosa_dai), |
241 | }; | 242 | }; |
diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c index b311ffe04b71..d6807e0372bd 100644 --- a/sound/soc/pxa/z2.c +++ b/sound/soc/pxa/z2.c | |||
@@ -202,6 +202,7 @@ static struct snd_soc_dai_link z2_dai = { | |||
202 | /* z2 audio machine driver */ | 202 | /* z2 audio machine driver */ |
203 | static struct snd_soc_card snd_soc_z2 = { | 203 | static struct snd_soc_card snd_soc_z2 = { |
204 | .name = "Z2", | 204 | .name = "Z2", |
205 | .owner = THIS_MODULE, | ||
205 | .dai_link = &z2_dai, | 206 | .dai_link = &z2_dai, |
206 | .num_links = 1, | 207 | .num_links = 1, |
207 | }; | 208 | }; |
diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c index 580aae38e502..ceb656695b0f 100644 --- a/sound/soc/pxa/zylonite.c +++ b/sound/soc/pxa/zylonite.c | |||
@@ -249,6 +249,7 @@ static int zylonite_resume_pre(struct snd_soc_card *card) | |||
249 | 249 | ||
250 | static struct snd_soc_card zylonite = { | 250 | static struct snd_soc_card zylonite = { |
251 | .name = "Zylonite", | 251 | .name = "Zylonite", |
252 | .owner = THIS_MODULE, | ||
252 | .probe = &zylonite_probe, | 253 | .probe = &zylonite_probe, |
253 | .remove = &zylonite_remove, | 254 | .remove = &zylonite_remove, |
254 | .suspend_post = &zylonite_suspend_post, | 255 | .suspend_post = &zylonite_suspend_post, |