aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2011-12-22 08:17:22 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-12-22 12:34:34 -0500
commit30e4953011fd7a22044a62b9cf77252493b1bd17 (patch)
treea0bdb7f5769ff00c80d068707590e1aea51e308b /sound/soc
parent338d68db77aaf90eea9e06517272b7d7a83d95a4 (diff)
ASoC: blackfin: 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/blackfin/bf5xx-ad1836.c1
-rw-r--r--sound/soc/blackfin/bf5xx-ad193x.c1
-rw-r--r--sound/soc/blackfin/bf5xx-ad1980.c1
-rw-r--r--sound/soc/blackfin/bf5xx-ad73311.c1
-rw-r--r--sound/soc/blackfin/bf5xx-ssm2602.c1
-rw-r--r--sound/soc/blackfin/bfin-eval-adau1373.c1
-rw-r--r--sound/soc/blackfin/bfin-eval-adau1701.c1
-rw-r--r--sound/soc/blackfin/bfin-eval-adav80x.c1
8 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c
index f79d1655e035..60962ce6cd4d 100644
--- a/sound/soc/blackfin/bf5xx-ad1836.c
+++ b/sound/soc/blackfin/bf5xx-ad1836.c
@@ -91,6 +91,7 @@ static struct snd_soc_dai_link bf5xx_ad1836_dai[] = {
91 91
92static struct snd_soc_card bf5xx_ad1836 = { 92static struct snd_soc_card bf5xx_ad1836 = {
93 .name = "bfin-ad1836", 93 .name = "bfin-ad1836",
94 .owner = THIS_MODULE,
94 .dai_link = &bf5xx_ad1836_dai[CONFIG_SND_BF5XX_SPORT_NUM], 95 .dai_link = &bf5xx_ad1836_dai[CONFIG_SND_BF5XX_SPORT_NUM],
95 .num_links = 1, 96 .num_links = 1,
96}; 97};
diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c
index 5956584ea3a4..2d8d82dbc159 100644
--- a/sound/soc/blackfin/bf5xx-ad193x.c
+++ b/sound/soc/blackfin/bf5xx-ad193x.c
@@ -119,6 +119,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
119 119
120static struct snd_soc_card bf5xx_ad193x = { 120static struct snd_soc_card bf5xx_ad193x = {
121 .name = "bfin-ad193x", 121 .name = "bfin-ad193x",
122 .owner = THIS_MODULE,
122 .dai_link = &bf5xx_ad193x_dai[CONFIG_SND_BF5XX_SPORT_NUM], 123 .dai_link = &bf5xx_ad193x_dai[CONFIG_SND_BF5XX_SPORT_NUM],
123 .num_links = 1, 124 .num_links = 1,
124}; 125};
diff --git a/sound/soc/blackfin/bf5xx-ad1980.c b/sound/soc/blackfin/bf5xx-ad1980.c
index 06a84b211b52..b30f88bbd703 100644
--- a/sound/soc/blackfin/bf5xx-ad1980.c
+++ b/sound/soc/blackfin/bf5xx-ad1980.c
@@ -74,6 +74,7 @@ static struct snd_soc_dai_link bf5xx_board_dai[] = {
74 74
75static struct snd_soc_card bf5xx_board = { 75static struct snd_soc_card bf5xx_board = {
76 .name = "bfin-ad1980", 76 .name = "bfin-ad1980",
77 .owner = THIS_MODULE,
77 .dai_link = &bf5xx_board_dai[CONFIG_SND_BF5XX_SPORT_NUM], 78 .dai_link = &bf5xx_board_dai[CONFIG_SND_BF5XX_SPORT_NUM],
78 .num_links = 1, 79 .num_links = 1,
79}; 80};
diff --git a/sound/soc/blackfin/bf5xx-ad73311.c b/sound/soc/blackfin/bf5xx-ad73311.c
index b94eb7ef7d16..8e49508596da 100644
--- a/sound/soc/blackfin/bf5xx-ad73311.c
+++ b/sound/soc/blackfin/bf5xx-ad73311.c
@@ -192,6 +192,7 @@ static struct snd_soc_dai_link bf5xx_ad73311_dai[] = {
192 192
193static struct snd_soc_card bf5xx_ad73311 = { 193static struct snd_soc_card bf5xx_ad73311 = {
194 .name = "bfin-ad73311", 194 .name = "bfin-ad73311",
195 .owner = THIS_MODULE,
195 .probe = bf5xx_probe, 196 .probe = bf5xx_probe,
196 .dai_link = &bf5xx_ad73311_dai[CONFIG_SND_BF5XX_SPORT_NUM], 197 .dai_link = &bf5xx_ad73311_dai[CONFIG_SND_BF5XX_SPORT_NUM],
197 .num_links = 1, 198 .num_links = 1,
diff --git a/sound/soc/blackfin/bf5xx-ssm2602.c b/sound/soc/blackfin/bf5xx-ssm2602.c
index 767e772a815d..030303238042 100644
--- a/sound/soc/blackfin/bf5xx-ssm2602.c
+++ b/sound/soc/blackfin/bf5xx-ssm2602.c
@@ -125,6 +125,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai[] = {
125 125
126static struct snd_soc_card bf5xx_ssm2602 = { 126static struct snd_soc_card bf5xx_ssm2602 = {
127 .name = "bfin-ssm2602", 127 .name = "bfin-ssm2602",
128 .owner = THIS_MODULE,
128 .dai_link = &bf5xx_ssm2602_dai[CONFIG_SND_BF5XX_SPORT_NUM], 129 .dai_link = &bf5xx_ssm2602_dai[CONFIG_SND_BF5XX_SPORT_NUM],
129 .num_links = 1, 130 .num_links = 1,
130}; 131};
diff --git a/sound/soc/blackfin/bfin-eval-adau1373.c b/sound/soc/blackfin/bfin-eval-adau1373.c
index 85ed39abe10e..26b271c62efa 100644
--- a/sound/soc/blackfin/bfin-eval-adau1373.c
+++ b/sound/soc/blackfin/bfin-eval-adau1373.c
@@ -147,6 +147,7 @@ static struct snd_soc_dai_link bfin_eval_adau1373_dai = {
147 147
148static struct snd_soc_card bfin_eval_adau1373 = { 148static struct snd_soc_card bfin_eval_adau1373 = {
149 .name = "bfin-eval-adau1373", 149 .name = "bfin-eval-adau1373",
150 .owner = THIS_MODULE,
150 .dai_link = &bfin_eval_adau1373_dai, 151 .dai_link = &bfin_eval_adau1373_dai,
151 .num_links = 1, 152 .num_links = 1,
152 153
diff --git a/sound/soc/blackfin/bfin-eval-adau1701.c b/sound/soc/blackfin/bfin-eval-adau1701.c
index 1a88fe9ce34c..c0064fa1dca6 100644
--- a/sound/soc/blackfin/bfin-eval-adau1701.c
+++ b/sound/soc/blackfin/bfin-eval-adau1701.c
@@ -84,6 +84,7 @@ static struct snd_soc_dai_link bfin_eval_adau1701_dai[] = {
84 84
85static struct snd_soc_card bfin_eval_adau1701 = { 85static struct snd_soc_card bfin_eval_adau1701 = {
86 .name = "bfin-eval-adau1701", 86 .name = "bfin-eval-adau1701",
87 .owner = THIS_MODULE,
87 .dai_link = &bfin_eval_adau1701_dai[CONFIG_SND_BF5XX_SPORT_NUM], 88 .dai_link = &bfin_eval_adau1701_dai[CONFIG_SND_BF5XX_SPORT_NUM],
88 .num_links = 1, 89 .num_links = 1,
89 90
diff --git a/sound/soc/blackfin/bfin-eval-adav80x.c b/sound/soc/blackfin/bfin-eval-adav80x.c
index 0bc995fb6283..4ef079f95e2e 100644
--- a/sound/soc/blackfin/bfin-eval-adav80x.c
+++ b/sound/soc/blackfin/bfin-eval-adav80x.c
@@ -93,6 +93,7 @@ static struct snd_soc_dai_link bfin_eval_adav80x_dais[] = {
93 93
94static struct snd_soc_card bfin_eval_adav80x = { 94static struct snd_soc_card bfin_eval_adav80x = {
95 .name = "bfin-eval-adav80x", 95 .name = "bfin-eval-adav80x",
96 .owner = THIS_MODULE,
96 .dai_link = bfin_eval_adav80x_dais, 97 .dai_link = bfin_eval_adav80x_dais,
97 .num_links = ARRAY_SIZE(bfin_eval_adav80x_dais), 98 .num_links = ARRAY_SIZE(bfin_eval_adav80x_dais),
98 99