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>

diff --git a/sound/soc/omap/am3517evm.c b/sound/soc/omap/am3517evm.c
index c1cd4a0cbe9e6f573625c42acd0883fe20bb7e3e..add4866d7e67bce97b95083f2d36ce4f06e4ccd9 100644 (file)
--- a/sound/soc/omap/am3517evm.c
+++ b/sound/soc/omap/am3517evm.c
@@ -107,6 +107,7 @@ static struct snd_soc_dai_link am3517evm_dai = {
 /* Audio machine driver */
 static struct snd_soc_card snd_soc_am3517evm = {
        .name = "am3517evm",
+       .owner = THIS_MODULE,
        .dai_link = &am3517evm_dai,
        .num_links = 1,
 

diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index a04a4338fdac131e5542dc0a41c757e3ed5a46a7..3e523a7a9efb4447130709f71cd8c243c89b3f76 100644 (file)
--- 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 = {
 /* Audio card driver */
 static struct snd_soc_card ams_delta_audio_card = {
        .name = "AMS_DELTA",
+       .owner = THIS_MODULE,
        .dai_link = &ams_delta_dai_link,
        .num_links = 1,
        .set_bias_level = ams_delta_set_bias_level,

diff --git a/sound/soc/omap/igep0020.c b/sound/soc/omap/igep0020.c
index 591fbf8f7cd95a57002c1980e7ac9233e55fc710..ccae58a1339cc859e88a2346663fdb812ac3b9c0 100644 (file)
--- a/sound/soc/omap/igep0020.c
+++ b/sound/soc/omap/igep0020.c
@@ -72,6 +72,7 @@ static struct snd_soc_dai_link igep2_dai = {
 /* Audio machine driver */
 static struct snd_soc_card snd_soc_card_igep2 = {
        .name = "igep2",
+       .owner = THIS_MODULE,
        .dai_link = &igep2_dai,
        .num_links = 1,
 };

diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index fc6209b3f20c92ae4b1824fb29a13624b7b1f1d5..597be412f1e40080336be9604940cbfab72012fd 100644 (file)
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -289,6 +289,7 @@ static struct snd_soc_dai_link n810_dai = {
 /* Audio machine driver */
 static struct snd_soc_card snd_soc_n810 = {
        .name = "N810",
+       .owner = THIS_MODULE,
        .dai_link = &n810_dai,
        .num_links = 1,
 

diff --git a/sound/soc/omap/omap3evm.c b/sound/soc/omap/omap3evm.c
index 68578959e4aa014b93bf6c09eb59cf2cef04996a..071fcb09b8b27df357394ef0e11adbd1bf543b6e 100644 (file)
--- a/sound/soc/omap/omap3evm.c
+++ b/sound/soc/omap/omap3evm.c
@@ -70,6 +70,7 @@ static struct snd_soc_dai_link omap3evm_dai = {
 /* Audio machine driver */
 static struct snd_soc_card snd_soc_omap3evm = {
        .name = "omap3evm",
+       .owner = THIS_MODULE,
        .dai_link = &omap3evm_dai,
        .num_links = 1,
 };

diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c
index 7605c37c91e79f085c81d952d0fc9d09f91fdf0d..07794bd10952f7355232a64cd46790e9283d02a0 100644 (file)
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/omap/omap3pandora.c
@@ -233,6 +233,7 @@ static struct snd_soc_dai_link omap3pandora_dai[] = {
 /* SoC card */
 static struct snd_soc_card snd_soc_card_omap3pandora = {
        .name = "omap3pandora",
+       .owner = THIS_MODULE,
        .dai_link = omap3pandora_dai,
        .num_links = ARRAY_SIZE(omap3pandora_dai),
 };

diff --git a/sound/soc/omap/omap4-hdmi-card.c b/sound/soc/omap/omap4-hdmi-card.c
index 52d471c1eeedc63b81be42aee5b337dded08725f..28d689b2714db4e009190fa8af3b1c31481659b8 100644 (file)
--- 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 = {
 
 static struct snd_soc_card snd_soc_omap4_hdmi = {
        .name = "OMAP4HDMI",
+       .owner = THIS_MODULE,
        .dai_link = &omap4_hdmi_dai,
        .num_links = 1,
 };

diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index 351ec9db384d4590ae6d34103e98316d80dc9a61..d859b597e7ec973cf5477b0bd9f620f5be55b4ab 100644 (file)
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -108,6 +108,7 @@ static struct snd_soc_dai_link osk_dai = {
 /* Audio machine driver */
 static struct snd_soc_card snd_soc_card_osk = {
        .name = "OSK5912",
+       .owner = THIS_MODULE,
        .dai_link = &osk_dai,
        .num_links = 1,
 

diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c
index c3550aeee533d55a2bcbb534c811a549721d99b7..2ee889c502564f42fa69ac8ef31c3f9dd22fe0af 100644 (file)
--- a/sound/soc/omap/overo.c
+++ b/sound/soc/omap/overo.c
@@ -72,6 +72,7 @@ static struct snd_soc_dai_link overo_dai = {
 /* Audio machine driver */
 static struct snd_soc_card snd_soc_card_overo = {
        .name = "overo",
+       .owner = THIS_MODULE,
        .dai_link = &overo_dai,
        .num_links = 1,
 };

diff --git a/sound/soc/omap/rx51.c b/sound/soc/omap/rx51.c
index ad16db5363203c9a9a8c9af4ebd5b3684bcaff8a..fada6ef43eeae736750ef60de289efb0fa48af1d 100644 (file)
--- 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[] = {
 /* Audio card */
 static struct snd_soc_card rx51_sound_card = {
        .name = "RX-51",
+       .owner = THIS_MODULE,
        .dai_link = rx51_dai,
        .num_links = ARRAY_SIZE(rx51_dai),
        .aux_dev = rx51_aux_dev,

diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index e8fbf8efdbb85dc120dfc3173180851e9a05be81..2c850662ea7ea79f70978ac19916cf07c9ee7542 100644 (file)
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -213,6 +213,7 @@ static struct snd_soc_dai_link sdp3430_dai[] = {
 /* Audio machine driver */
 static struct snd_soc_card snd_soc_sdp3430 = {
        .name = "SDP3430",
+       .owner = THIS_MODULE,
        .dai_link = sdp3430_dai,
        .num_links = ARRAY_SIZE(sdp3430_dai),
 

diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c
index 2735fa03b74b0dcfb7d1e14f3600e33f5a15176d..175ba9a04edfbd449b8b4822df6b5d1561a25e3a 100644 (file)
--- a/sound/soc/omap/sdp4430.c
+++ b/sound/soc/omap/sdp4430.c
@@ -226,6 +226,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = {
 /* Audio machine driver */
 static struct snd_soc_card snd_soc_sdp4430 = {
        .name = "SDP4430",
+       .owner = THIS_MODULE,
        .dai_link = sdp4430_dai,
        .num_links = ARRAY_SIZE(sdp4430_dai),
 

diff --git a/sound/soc/omap/zoom2.c b/sound/soc/omap/zoom2.c
index 7641a7fa8f972dc6a32460e11be18b3a3a68c889..981616d61f6762ff459f1a7dd8c3fa9e2a621fd4 100644 (file)
--- a/sound/soc/omap/zoom2.c
+++ b/sound/soc/omap/zoom2.c
@@ -157,6 +157,7 @@ static struct snd_soc_dai_link zoom2_dai[] = {
 /* Audio machine driver */
 static struct snd_soc_card snd_soc_zoom2 = {
        .name = "Zoom2",
+       .owner = THIS_MODULE,
        .dai_link = zoom2_dai,
        .num_links = ARRAY_SIZE(zoom2_dai),