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>

diff --git a/sound/soc/pxa/corgi.c b/sound/soc/pxa/corgi.c
index b0e2fb720910533d442be66e68db112dbbc93dce..5e5004a840738b2d696d7ab62662f5ba904a2355 100644 (file)
--- a/sound/soc/pxa/corgi.c
+++ b/sound/soc/pxa/corgi.c
@@ -317,6 +317,7 @@ static struct snd_soc_dai_link corgi_dai = {
 /* corgi audio machine driver */
 static struct snd_soc_card snd_soc_corgi = {
        .name = "Corgi",
+       .owner = THIS_MODULE,
        .dai_link = &corgi_dai,
        .num_links = 1,
 };

diff --git a/sound/soc/pxa/e740_wm9705.c b/sound/soc/pxa/e740_wm9705.c
index 203ab78a4d68bbf4bd8b992f5009bd45345f5362..7b1bc2390039ab324b5146daf63c5a72ec21411e 100644 (file)
--- 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[] = {
 
 static struct snd_soc_card e740 = {
        .name = "Toshiba e740",
+       .owner = THIS_MODULE,
        .dai_link = e740_dai,
        .num_links = ARRAY_SIZE(e740_dai),
 };

diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c
index 27f90cc442343fb47486acfabfaabb07831e2d11..47b89d71e287bc087640cdf064a7c4f6a92cdfea 100644 (file)
--- 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[] = {
 
 static struct snd_soc_card e750 = {
        .name = "Toshiba e750",
+       .owner = THIS_MODULE,
        .dai_link = e750_dai,
        .num_links = ARRAY_SIZE(e750_dai),
 };

diff --git a/sound/soc/pxa/e800_wm9712.c b/sound/soc/pxa/e800_wm9712.c
index 858bf94160c517ff4cca5d2fd9e1e12629fbcb08..ea9707ec6f28e706847e9991ee756747eac5309a 100644 (file)
--- 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[] = {
 
 static struct snd_soc_card e800 = {
        .name = "Toshiba e800",
+       .owner = THIS_MODULE,
        .dai_link = e800_dai,
        .num_links = ARRAY_SIZE(e800_dai),
 };

diff --git a/sound/soc/pxa/em-x270.c b/sound/soc/pxa/em-x270.c
index b13a4252812da77235f05ebe24359b9ea0950832..64743a05aeae96172a3fe18e2163c7e1f453635b 100644 (file)
--- 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[] = {
 
 static struct snd_soc_card em_x270 = {
        .name = "EM-X270",
+       .owner = THIS_MODULE,
        .dai_link = em_x270_dai,
        .num_links = ARRAY_SIZE(em_x270_dai),
 };

diff --git a/sound/soc/pxa/hx4700.c b/sound/soc/pxa/hx4700.c
index 8260207818a5bb56281104f3b2b2c6d7c329582d..2a342c92d829563fbe3089bac84e486078ce8ef3 100644 (file)
--- a/sound/soc/pxa/hx4700.c
+++ b/sound/soc/pxa/hx4700.c
@@ -169,6 +169,7 @@ static struct snd_soc_dai_link hx4700_dai = {
 /* hx4700 audio machine driver */
 static struct snd_soc_card snd_soc_card_hx4700 = {
        .name                   = "iPAQ hx4700",
+       .owner                  = THIS_MODULE,
        .dai_link               = &hx4700_dai,
        .num_links              = 1,
        .dapm_widgets           = hx4700_dapm_widgets,

diff --git a/sound/soc/pxa/imote2.c b/sound/soc/pxa/imote2.c
index dc905aec6294b511693693376960f586547ef087..b93dafd32b809e63dd8280441261cde86da9f9ab 100644 (file)
--- a/sound/soc/pxa/imote2.c
+++ b/sound/soc/pxa/imote2.c
@@ -60,6 +60,7 @@ static struct snd_soc_dai_link imote2_dai = {
 
 static struct snd_soc_card imote2 = {
        .name = "Imote2",
+       .owner = THIS_MODULE,
        .dai_link = &imote2_dai,
        .num_links = 1,
 };

diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index e79f516c400e6df35a57b41356fe3ce39882e3ca..3f7a8ecb97206b875469d5de5a2bf21410dd9034 100644 (file)
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -452,6 +452,7 @@ static struct snd_soc_dai_link magician_dai[] = {
 /* magician audio machine driver */
 static struct snd_soc_card snd_soc_card_magician = {
        .name = "Magician",
+       .owner = THIS_MODULE,
        .dai_link = magician_dai,
        .num_links = ARRAY_SIZE(magician_dai),
 

diff --git a/sound/soc/pxa/mioa701_wm9713.c b/sound/soc/pxa/mioa701_wm9713.c
index 0e73a7f718e42d2f66d47529b9f749685281093e..9c585af59b5f52e572f61699a346e794f7579299 100644 (file)
--- 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[] = {
 
 static struct snd_soc_card mioa701 = {
        .name = "MioA701",
+       .owner = THIS_MODULE,
        .dai_link = mioa701_dai,
        .num_links = ARRAY_SIZE(mioa701_dai),
 };

diff --git a/sound/soc/pxa/palm27x.c b/sound/soc/pxa/palm27x.c
index f313eca40fdc96cb5fcd39b1d4df3f4f18ee9358..db24bc685bd3ddb6a1dfb6076eec9fdbf128c7d1 100644 (file)
--- a/sound/soc/pxa/palm27x.c
+++ b/sound/soc/pxa/palm27x.c
@@ -146,6 +146,7 @@ static struct snd_soc_dai_link palm27x_dai[] = {
 
 static struct snd_soc_card palm27x_asoc = {
        .name = "Palm/PXA27x",
+       .owner = THIS_MODULE,
        .dai_link = palm27x_dai,
        .num_links = ARRAY_SIZE(palm27x_dai),
 };

diff --git a/sound/soc/pxa/raumfeld.c b/sound/soc/pxa/raumfeld.c
index b899a3bc8f42356cce6e9c6f1629bf0402f5706d..ba1545188ec66150b953234bd086f5cccc0f0882 100644 (file)
--- 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[] =
 
 static struct snd_soc_card snd_soc_raumfeld_connector = {
        .name           = "Raumfeld Connector",
+       .owner          = THIS_MODULE,
        .dai_link       = snd_soc_raumfeld_connector_dai,
        .num_links      = ARRAY_SIZE(snd_soc_raumfeld_connector_dai),
        .suspend_post   = raumfeld_analog_suspend,
@@ -268,6 +269,7 @@ static struct snd_soc_card snd_soc_raumfeld_connector = {
 
 static struct snd_soc_card snd_soc_raumfeld_speaker = {
        .name           = "Raumfeld Speaker",
+       .owner          = THIS_MODULE,
        .dai_link       = snd_soc_raumfeld_speaker_dai,
        .num_links      = ARRAY_SIZE(snd_soc_raumfeld_speaker_dai),
        .suspend_post   = raumfeld_analog_suspend,

diff --git a/sound/soc/pxa/saarb.c b/sound/soc/pxa/saarb.c
index d9467a2c6de0ec635d0c4d9a0cc8f838b24f8f64..2e21712cec6765a5089c78352020dbf23f698cce 100644 (file)
--- a/sound/soc/pxa/saarb.c
+++ b/sound/soc/pxa/saarb.c
@@ -125,6 +125,7 @@ static struct snd_soc_dai_link saarb_dai[] = {
 
 static struct snd_soc_card snd_soc_card_saarb = {
        .name = "Saarb",
+       .owner = THIS_MODULE,
        .dai_link = saarb_dai,
        .num_links = ARRAY_SIZE(saarb_dai),
 };

diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c
index c2d6ff9b1588a63c7faed4477e944b5948da51d7..bb060482c00d06cd971cf53c02405775f4863bac 100644 (file)
--- a/sound/soc/pxa/spitz.c
+++ b/sound/soc/pxa/spitz.c
@@ -319,6 +319,7 @@ static struct snd_soc_dai_link spitz_dai = {
 /* spitz audio machine driver */
 static struct snd_soc_card snd_soc_spitz = {
        .name = "Spitz",
+       .owner = THIS_MODULE,
        .dai_link = &spitz_dai,
        .num_links = 1,
 };

diff --git a/sound/soc/pxa/tavorevb3.c b/sound/soc/pxa/tavorevb3.c
index eeec892e0e0480ac07a167cfc84f626ea552121d..4bef12cd424d96a0bfc45ca8a772f88677acd57e 100644 (file)
--- a/sound/soc/pxa/tavorevb3.c
+++ b/sound/soc/pxa/tavorevb3.c
@@ -125,6 +125,7 @@ static struct snd_soc_dai_link evb3_dai[] = {
 
 static struct snd_soc_card snd_soc_card_evb3 = {
        .name = "Tavor EVB3",
+       .owner = THIS_MODULE,
        .dai_link = evb3_dai,
        .num_links = ARRAY_SIZE(evb3_dai),
 };

diff --git a/sound/soc/pxa/tosa.c b/sound/soc/pxa/tosa.c
index 3f394de297a2d0b18f18a5fb0c30a4e79e8d3203..564ef08a89f2d410efae0d45dcdc1691d9e32b5d 100644 (file)
--- a/sound/soc/pxa/tosa.c
+++ b/sound/soc/pxa/tosa.c
@@ -236,6 +236,7 @@ static struct snd_soc_dai_link tosa_dai[] = {
 
 static struct snd_soc_card tosa = {
        .name = "Tosa",
+       .owner = THIS_MODULE,
        .dai_link = tosa_dai,
        .num_links = ARRAY_SIZE(tosa_dai),
 };

diff --git a/sound/soc/pxa/z2.c b/sound/soc/pxa/z2.c
index b311ffe04b71f6a0a1e87bd7470f0b50a422ecd3..d6807e0372bda239334e7f41f74fd7d34e027050 100644 (file)
--- a/sound/soc/pxa/z2.c
+++ b/sound/soc/pxa/z2.c
@@ -202,6 +202,7 @@ static struct snd_soc_dai_link z2_dai = {
 /* z2 audio machine driver */
 static struct snd_soc_card snd_soc_z2 = {
        .name           = "Z2",
+       .owner          = THIS_MODULE,
        .dai_link       = &z2_dai,
        .num_links      = 1,
 };

diff --git a/sound/soc/pxa/zylonite.c b/sound/soc/pxa/zylonite.c
index 580aae38e502ce859e0d58978f0f0c0d0b30d4ba..ceb656695b0fbc2f438779ac8331052063d83643 100644 (file)
--- 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)
 
 static struct snd_soc_card zylonite = {
        .name = "Zylonite",
+       .owner = THIS_MODULE,
        .probe = &zylonite_probe,
        .remove = &zylonite_remove,
        .suspend_post = &zylonite_suspend_post,