ASoC: davinci: Add .owner to struct snd_soc_card
authorAxel Lin <axel.lin@gmail.com>
Thu, 22 Dec 2011 13:19:42 +0000 (21:19 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 22 Dec 2011 17:34:34 +0000 (17:34 +0000)
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>
sound/soc/davinci/davinci-evm.c
sound/soc/davinci/davinci-sffsdr.c

index f78c3f0..10a2d8c 100644 (file)
@@ -242,6 +242,7 @@ static struct snd_soc_dai_link da850_evm_dai = {
 /* davinci dm6446 evm audio machine driver */
 static struct snd_soc_card dm6446_snd_soc_card_evm = {
        .name = "DaVinci DM6446 EVM",
+       .owner = THIS_MODULE,
        .dai_link = &dm6446_evm_dai,
        .num_links = 1,
 };
@@ -249,6 +250,7 @@ static struct snd_soc_card dm6446_snd_soc_card_evm = {
 /* davinci dm355 evm audio machine driver */
 static struct snd_soc_card dm355_snd_soc_card_evm = {
        .name = "DaVinci DM355 EVM",
+       .owner = THIS_MODULE,
        .dai_link = &dm355_evm_dai,
        .num_links = 1,
 };
@@ -256,6 +258,7 @@ static struct snd_soc_card dm355_snd_soc_card_evm = {
 /* davinci dm365 evm audio machine driver */
 static struct snd_soc_card dm365_snd_soc_card_evm = {
        .name = "DaVinci DM365 EVM",
+       .owner = THIS_MODULE,
        .dai_link = &dm365_evm_dai,
        .num_links = 1,
 };
@@ -263,18 +266,21 @@ static struct snd_soc_card dm365_snd_soc_card_evm = {
 /* davinci dm6467 evm audio machine driver */
 static struct snd_soc_card dm6467_snd_soc_card_evm = {
        .name = "DaVinci DM6467 EVM",
+       .owner = THIS_MODULE,
        .dai_link = dm6467_evm_dai,
        .num_links = ARRAY_SIZE(dm6467_evm_dai),
 };
 
 static struct snd_soc_card da830_snd_soc_card = {
        .name = "DA830/OMAP-L137 EVM",
+       .owner = THIS_MODULE,
        .dai_link = &da830_evm_dai,
        .num_links = 1,
 };
 
 static struct snd_soc_card da850_snd_soc_card = {
        .name = "DA850/OMAP-L138 EVM",
+       .owner = THIS_MODULE,
        .dai_link = &da850_evm_dai,
        .num_links = 1,
 };
index 0fe558c..f71175b 100644 (file)
@@ -93,6 +93,7 @@ static struct snd_soc_dai_link sffsdr_dai = {
 /* davinci-sffsdr audio machine driver */
 static struct snd_soc_card snd_soc_sffsdr = {
        .name = "DaVinci SFFSDR",
+       .owner = THIS_MODULE,
        .dai_link = &sffsdr_dai,
        .num_links = 1,
 };