diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-12-21 21:53:15 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-22 06:04:18 -0500 |
| commit | 095d79dc491dab1311978e0efb252bc23da88b32 (patch) | |
| tree | c58cd4f7abab858d58ebdd4c225747d7e5795e4e | |
| parent | 561c6a172f065fa918d0ff3cecdca1b22dca893f (diff) | |
ASoC: samsung: 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>
| -rw-r--r-- | sound/soc/samsung/goni_wm8994.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/h1940_uda1380.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/jive_wm8750.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/littlemill.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/ln2440sbc_alc650.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/lowland.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/neo1973_wm8753.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/rx1950_uda1380.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/s3c24xx_simtec_hermes.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/s3c24xx_uda134x.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/smartq_wm8987.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/smdk2443_wm9710.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/smdk_spdif.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/smdk_wm8580.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/smdk_wm8580pcm.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/smdk_wm8994.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/smdk_wm8994pcm.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/smdk_wm9713.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/speyside.c | 1 | ||||
| -rw-r--r-- | sound/soc/samsung/tobermory.c | 1 |
21 files changed, 21 insertions, 0 deletions
diff --git a/sound/soc/samsung/goni_wm8994.c b/sound/soc/samsung/goni_wm8994.c index 84f9c3cf7f3e..c23c2ae91f58 100644 --- a/sound/soc/samsung/goni_wm8994.c +++ b/sound/soc/samsung/goni_wm8994.c | |||
| @@ -244,6 +244,7 @@ static struct snd_soc_dai_link goni_dai[] = { | |||
| 244 | 244 | ||
| 245 | static struct snd_soc_card goni = { | 245 | static struct snd_soc_card goni = { |
| 246 | .name = "goni", | 246 | .name = "goni", |
| 247 | .owner = THIS_MODULE, | ||
| 247 | .dai_link = goni_dai, | 248 | .dai_link = goni_dai, |
| 248 | .num_links = ARRAY_SIZE(goni_dai), | 249 | .num_links = ARRAY_SIZE(goni_dai), |
| 249 | 250 | ||
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c index 03cfa5fcdcca..6e3257717c54 100644 --- a/sound/soc/samsung/h1940_uda1380.c +++ b/sound/soc/samsung/h1940_uda1380.c | |||
| @@ -215,6 +215,7 @@ static struct snd_soc_dai_link h1940_uda1380_dai[] = { | |||
| 215 | 215 | ||
| 216 | static struct snd_soc_card h1940_asoc = { | 216 | static struct snd_soc_card h1940_asoc = { |
| 217 | .name = "h1940", | 217 | .name = "h1940", |
| 218 | .owner = THIS_MODULE, | ||
| 218 | .dai_link = h1940_uda1380_dai, | 219 | .dai_link = h1940_uda1380_dai, |
| 219 | .num_links = ARRAY_SIZE(h1940_uda1380_dai), | 220 | .num_links = ARRAY_SIZE(h1940_uda1380_dai), |
| 220 | 221 | ||
diff --git a/sound/soc/samsung/jive_wm8750.c b/sound/soc/samsung/jive_wm8750.c index 8e523fd9189e..1578663a1faa 100644 --- a/sound/soc/samsung/jive_wm8750.c +++ b/sound/soc/samsung/jive_wm8750.c | |||
| @@ -127,6 +127,7 @@ static struct snd_soc_dai_link jive_dai = { | |||
| 127 | /* jive audio machine driver */ | 127 | /* jive audio machine driver */ |
| 128 | static struct snd_soc_card snd_soc_machine_jive = { | 128 | static struct snd_soc_card snd_soc_machine_jive = { |
| 129 | .name = "Jive", | 129 | .name = "Jive", |
| 130 | .owner = THIS_MODULE, | ||
| 130 | .dai_link = &jive_dai, | 131 | .dai_link = &jive_dai, |
| 131 | .num_links = 1, | 132 | .num_links = 1, |
| 132 | 133 | ||
diff --git a/sound/soc/samsung/littlemill.c b/sound/soc/samsung/littlemill.c index 5cea59beec9f..9dd818bde06f 100644 --- a/sound/soc/samsung/littlemill.c +++ b/sound/soc/samsung/littlemill.c | |||
| @@ -194,6 +194,7 @@ static int littlemill_late_probe(struct snd_soc_card *card) | |||
| 194 | 194 | ||
| 195 | static struct snd_soc_card littlemill = { | 195 | static struct snd_soc_card littlemill = { |
| 196 | .name = "Littlemill", | 196 | .name = "Littlemill", |
| 197 | .owner = THIS_MODULE, | ||
| 197 | .dai_link = littlemill_dai, | 198 | .dai_link = littlemill_dai, |
| 198 | .num_links = ARRAY_SIZE(littlemill_dai), | 199 | .num_links = ARRAY_SIZE(littlemill_dai), |
| 199 | 200 | ||
diff --git a/sound/soc/samsung/ln2440sbc_alc650.c b/sound/soc/samsung/ln2440sbc_alc650.c index cde38b8e9dc2..69c4a5934a4d 100644 --- a/sound/soc/samsung/ln2440sbc_alc650.c +++ b/sound/soc/samsung/ln2440sbc_alc650.c | |||
| @@ -34,6 +34,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = { | |||
| 34 | 34 | ||
| 35 | static struct snd_soc_card ln2440sbc = { | 35 | static struct snd_soc_card ln2440sbc = { |
| 36 | .name = "LN2440SBC", | 36 | .name = "LN2440SBC", |
| 37 | .owner = THIS_MODULE, | ||
| 37 | .dai_link = ln2440sbc_dai, | 38 | .dai_link = ln2440sbc_dai, |
| 38 | .num_links = ARRAY_SIZE(ln2440sbc_dai), | 39 | .num_links = ARRAY_SIZE(ln2440sbc_dai), |
| 39 | }; | 40 | }; |
diff --git a/sound/soc/samsung/lowland.c b/sound/soc/samsung/lowland.c index 4216a06b45f5..4adff934f771 100644 --- a/sound/soc/samsung/lowland.c +++ b/sound/soc/samsung/lowland.c | |||
| @@ -177,6 +177,7 @@ static struct snd_soc_dapm_route audio_paths[] = { | |||
| 177 | 177 | ||
| 178 | static struct snd_soc_card lowland = { | 178 | static struct snd_soc_card lowland = { |
| 179 | .name = "Lowland", | 179 | .name = "Lowland", |
| 180 | .owner = THIS_MODULE, | ||
| 180 | .dai_link = lowland_dai, | 181 | .dai_link = lowland_dai, |
| 181 | .num_links = ARRAY_SIZE(lowland_dai), | 182 | .num_links = ARRAY_SIZE(lowland_dai), |
| 182 | .aux_dev = lowland_aux_dev, | 183 | .aux_dev = lowland_aux_dev, |
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c index 7207189cd211..7ac0ba2025c3 100644 --- a/sound/soc/samsung/neo1973_wm8753.c +++ b/sound/soc/samsung/neo1973_wm8753.c | |||
| @@ -465,6 +465,7 @@ static const struct gpio neo1973_gta02_gpios[] = {}; | |||
| 465 | 465 | ||
| 466 | static struct snd_soc_card neo1973 = { | 466 | static struct snd_soc_card neo1973 = { |
| 467 | .name = "neo1973", | 467 | .name = "neo1973", |
| 468 | .owner = THIS_MODULE, | ||
| 468 | .dai_link = neo1973_dai, | 469 | .dai_link = neo1973_dai, |
| 469 | .num_links = ARRAY_SIZE(neo1973_dai), | 470 | .num_links = ARRAY_SIZE(neo1973_dai), |
| 470 | .aux_dev = neo1973_aux_devs, | 471 | .aux_dev = neo1973_aux_devs, |
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c index 71b4c029fc35..21e12361a9cd 100644 --- a/sound/soc/samsung/rx1950_uda1380.c +++ b/sound/soc/samsung/rx1950_uda1380.c | |||
| @@ -114,6 +114,7 @@ static const struct snd_soc_dapm_route audio_map[] = { | |||
| 114 | 114 | ||
| 115 | static struct snd_soc_card rx1950_asoc = { | 115 | static struct snd_soc_card rx1950_asoc = { |
| 116 | .name = "rx1950", | 116 | .name = "rx1950", |
| 117 | .owner = THIS_MODULE, | ||
| 117 | .dai_link = rx1950_uda1380_dai, | 118 | .dai_link = rx1950_uda1380_dai, |
| 118 | .num_links = ARRAY_SIZE(rx1950_uda1380_dai), | 119 | .num_links = ARRAY_SIZE(rx1950_uda1380_dai), |
| 119 | 120 | ||
diff --git a/sound/soc/samsung/s3c24xx_simtec_hermes.c b/sound/soc/samsung/s3c24xx_simtec_hermes.c index 502798100f21..7ace6a87f41b 100644 --- a/sound/soc/samsung/s3c24xx_simtec_hermes.c +++ b/sound/soc/samsung/s3c24xx_simtec_hermes.c | |||
| @@ -89,6 +89,7 @@ static struct snd_soc_dai_link simtec_dai_aic33 = { | |||
| 89 | /* simtec audio machine driver */ | 89 | /* simtec audio machine driver */ |
| 90 | static struct snd_soc_card snd_soc_machine_simtec_aic33 = { | 90 | static struct snd_soc_card snd_soc_machine_simtec_aic33 = { |
| 91 | .name = "Simtec-Hermes", | 91 | .name = "Simtec-Hermes", |
| 92 | .owner = THIS_MODULE, | ||
| 92 | .dai_link = &simtec_dai_aic33, | 93 | .dai_link = &simtec_dai_aic33, |
| 93 | .num_links = 1, | 94 | .num_links = 1, |
| 94 | 95 | ||
diff --git a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c index 89b57b5c3e17..c42d5f00b0e1 100644 --- a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c +++ b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | |||
| @@ -78,6 +78,7 @@ static struct snd_soc_dai_link simtec_dai_aic23 = { | |||
| 78 | /* simtec audio machine driver */ | 78 | /* simtec audio machine driver */ |
| 79 | static struct snd_soc_card snd_soc_machine_simtec_aic23 = { | 79 | static struct snd_soc_card snd_soc_machine_simtec_aic23 = { |
| 80 | .name = "Simtec", | 80 | .name = "Simtec", |
| 81 | .owner = THIS_MODULE, | ||
| 81 | .dai_link = &simtec_dai_aic23, | 82 | .dai_link = &simtec_dai_aic23, |
| 82 | .num_links = 1, | 83 | .num_links = 1, |
| 83 | 84 | ||
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c index 62b69fb6a085..d731042e51b0 100644 --- a/sound/soc/samsung/s3c24xx_uda134x.c +++ b/sound/soc/samsung/s3c24xx_uda134x.c | |||
| @@ -229,6 +229,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = { | |||
| 229 | 229 | ||
| 230 | static struct snd_soc_card snd_soc_s3c24xx_uda134x = { | 230 | static struct snd_soc_card snd_soc_s3c24xx_uda134x = { |
| 231 | .name = "S3C24XX_UDA134X", | 231 | .name = "S3C24XX_UDA134X", |
| 232 | .owner = THIS_MODULE, | ||
| 232 | .dai_link = &s3c24xx_uda134x_dai_link, | 233 | .dai_link = &s3c24xx_uda134x_dai_link, |
| 233 | .num_links = 1, | 234 | .num_links = 1, |
| 234 | }; | 235 | }; |
diff --git a/sound/soc/samsung/smartq_wm8987.c b/sound/soc/samsung/smartq_wm8987.c index a22fc4402802..f2dcb424ea25 100644 --- a/sound/soc/samsung/smartq_wm8987.c +++ b/sound/soc/samsung/smartq_wm8987.c | |||
| @@ -198,6 +198,7 @@ static struct snd_soc_dai_link smartq_dai[] = { | |||
| 198 | 198 | ||
| 199 | static struct snd_soc_card snd_soc_smartq = { | 199 | static struct snd_soc_card snd_soc_smartq = { |
| 200 | .name = "SmartQ", | 200 | .name = "SmartQ", |
| 201 | .owner = THIS_MODULE, | ||
| 201 | .dai_link = smartq_dai, | 202 | .dai_link = smartq_dai, |
| 202 | .num_links = ARRAY_SIZE(smartq_dai), | 203 | .num_links = ARRAY_SIZE(smartq_dai), |
| 203 | 204 | ||
diff --git a/sound/soc/samsung/smdk2443_wm9710.c b/sound/soc/samsung/smdk2443_wm9710.c index 8bd1dc5706bf..720ba29bb7e4 100644 --- a/sound/soc/samsung/smdk2443_wm9710.c +++ b/sound/soc/samsung/smdk2443_wm9710.c | |||
| @@ -30,6 +30,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = { | |||
| 30 | 30 | ||
