Skip to content

Commit

Permalink
ASoC: omap: Add .owner to struct snd_soc_card
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Axel Lin authored and Liam Girdwood committed Dec 23, 2011
1 parent c5cf4db commit b425b88
Show file tree
Hide file tree
Showing 13 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions sound/soc/omap/am3517evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down
1 change: 1 addition & 0 deletions sound/soc/omap/ams-delta.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions sound/soc/omap/igep0020.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
1 change: 1 addition & 0 deletions sound/soc/omap/n810.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down
1 change: 1 addition & 0 deletions sound/soc/omap/omap3evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
1 change: 1 addition & 0 deletions sound/soc/omap/omap3pandora.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),
};
Expand Down
1 change: 1 addition & 0 deletions sound/soc/omap/omap4-hdmi-card.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
1 change: 1 addition & 0 deletions sound/soc/omap/osk5912.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down
1 change: 1 addition & 0 deletions sound/soc/omap/overo.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
1 change: 1 addition & 0 deletions sound/soc/omap/rx51.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions sound/soc/omap/sdp3430.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),

Expand Down
1 change: 1 addition & 0 deletions sound/soc/omap/sdp4430.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),

Expand Down
1 change: 1 addition & 0 deletions sound/soc/omap/zoom2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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),

Expand Down

0 comments on commit b425b88

Please sign in to comment.