Commit b425b884 authored by Axel Lin's avatar Axel Lin Committed by Liam Girdwood

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: default avatarLothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@ti.com>
parent c5cf4dbc
...@@ -107,6 +107,7 @@ static struct snd_soc_dai_link am3517evm_dai = { ...@@ -107,6 +107,7 @@ static struct snd_soc_dai_link am3517evm_dai = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_am3517evm = { static struct snd_soc_card snd_soc_am3517evm = {
.name = "am3517evm", .name = "am3517evm",
.owner = THIS_MODULE,
.dai_link = &am3517evm_dai, .dai_link = &am3517evm_dai,
.num_links = 1, .num_links = 1,
......
...@@ -597,6 +597,7 @@ static struct snd_soc_dai_link ams_delta_dai_link = { ...@@ -597,6 +597,7 @@ static struct snd_soc_dai_link ams_delta_dai_link = {
/* Audio card driver */ /* Audio card driver */
static struct snd_soc_card ams_delta_audio_card = { static struct snd_soc_card ams_delta_audio_card = {
.name = "AMS_DELTA", .name = "AMS_DELTA",
.owner = THIS_MODULE,
.dai_link = &ams_delta_dai_link, .dai_link = &ams_delta_dai_link,
.num_links = 1, .num_links = 1,
.set_bias_level = ams_delta_set_bias_level, .set_bias_level = ams_delta_set_bias_level,
......
...@@ -72,6 +72,7 @@ static struct snd_soc_dai_link igep2_dai = { ...@@ -72,6 +72,7 @@ static struct snd_soc_dai_link igep2_dai = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_card_igep2 = { static struct snd_soc_card snd_soc_card_igep2 = {
.name = "igep2", .name = "igep2",
.owner = THIS_MODULE,
.dai_link = &igep2_dai, .dai_link = &igep2_dai,
.num_links = 1, .num_links = 1,
}; };
......
...@@ -289,6 +289,7 @@ static struct snd_soc_dai_link n810_dai = { ...@@ -289,6 +289,7 @@ static struct snd_soc_dai_link n810_dai = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_n810 = { static struct snd_soc_card snd_soc_n810 = {
.name = "N810", .name = "N810",
.owner = THIS_MODULE,
.dai_link = &n810_dai, .dai_link = &n810_dai,
.num_links = 1, .num_links = 1,
......
...@@ -70,6 +70,7 @@ static struct snd_soc_dai_link omap3evm_dai = { ...@@ -70,6 +70,7 @@ static struct snd_soc_dai_link omap3evm_dai = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_omap3evm = { static struct snd_soc_card snd_soc_omap3evm = {
.name = "omap3evm", .name = "omap3evm",
.owner = THIS_MODULE,
.dai_link = &omap3evm_dai, .dai_link = &omap3evm_dai,
.num_links = 1, .num_links = 1,
}; };
......
...@@ -233,6 +233,7 @@ static struct snd_soc_dai_link omap3pandora_dai[] = { ...@@ -233,6 +233,7 @@ static struct snd_soc_dai_link omap3pandora_dai[] = {
/* SoC card */ /* SoC card */
static struct snd_soc_card snd_soc_card_omap3pandora = { static struct snd_soc_card snd_soc_card_omap3pandora = {
.name = "omap3pandora", .name = "omap3pandora",
.owner = THIS_MODULE,
.dai_link = omap3pandora_dai, .dai_link = omap3pandora_dai,
.num_links = ARRAY_SIZE(omap3pandora_dai), .num_links = ARRAY_SIZE(omap3pandora_dai),
}; };
......
...@@ -74,6 +74,7 @@ static struct snd_soc_dai_link omap4_hdmi_dai = { ...@@ -74,6 +74,7 @@ static struct snd_soc_dai_link omap4_hdmi_dai = {
static struct snd_soc_card snd_soc_omap4_hdmi = { static struct snd_soc_card snd_soc_omap4_hdmi = {
.name = "OMAP4HDMI", .name = "OMAP4HDMI",
.owner = THIS_MODULE,
.dai_link = &omap4_hdmi_dai, .dai_link = &omap4_hdmi_dai,
.num_links = 1, .num_links = 1,
}; };
......
...@@ -108,6 +108,7 @@ static struct snd_soc_dai_link osk_dai = { ...@@ -108,6 +108,7 @@ static struct snd_soc_dai_link osk_dai = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_card_osk = { static struct snd_soc_card snd_soc_card_osk = {
.name = "OSK5912", .name = "OSK5912",
.owner = THIS_MODULE,
.dai_link = &osk_dai, .dai_link = &osk_dai,
.num_links = 1, .num_links = 1,
......
...@@ -72,6 +72,7 @@ static struct snd_soc_dai_link overo_dai = { ...@@ -72,6 +72,7 @@ static struct snd_soc_dai_link overo_dai = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_card_overo = { static struct snd_soc_card snd_soc_card_overo = {
.name = "overo", .name = "overo",
.owner = THIS_MODULE,
.dai_link = &overo_dai, .dai_link = &overo_dai,
.num_links = 1, .num_links = 1,
}; };
......
...@@ -383,6 +383,7 @@ static struct snd_soc_codec_conf rx51_codec_conf[] = { ...@@ -383,6 +383,7 @@ static struct snd_soc_codec_conf rx51_codec_conf[] = {
/* Audio card */ /* Audio card */
static struct snd_soc_card rx51_sound_card = { static struct snd_soc_card rx51_sound_card = {
.name = "RX-51", .name = "RX-51",
.owner = THIS_MODULE,
.dai_link = rx51_dai, .dai_link = rx51_dai,
.num_links = ARRAY_SIZE(rx51_dai), .num_links = ARRAY_SIZE(rx51_dai),
.aux_dev = rx51_aux_dev, .aux_dev = rx51_aux_dev,
......
...@@ -213,6 +213,7 @@ static struct snd_soc_dai_link sdp3430_dai[] = { ...@@ -213,6 +213,7 @@ static struct snd_soc_dai_link sdp3430_dai[] = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_sdp3430 = { static struct snd_soc_card snd_soc_sdp3430 = {
.name = "SDP3430", .name = "SDP3430",
.owner = THIS_MODULE,
.dai_link = sdp3430_dai, .dai_link = sdp3430_dai,
.num_links = ARRAY_SIZE(sdp3430_dai), .num_links = ARRAY_SIZE(sdp3430_dai),
......
...@@ -226,6 +226,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = { ...@@ -226,6 +226,7 @@ static struct snd_soc_dai_link sdp4430_dai[] = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_sdp4430 = { static struct snd_soc_card snd_soc_sdp4430 = {
.name = "SDP4430", .name = "SDP4430",
.owner = THIS_MODULE,
.dai_link = sdp4430_dai, .dai_link = sdp4430_dai,
.num_links = ARRAY_SIZE(sdp4430_dai), .num_links = ARRAY_SIZE(sdp4430_dai),
......
...@@ -157,6 +157,7 @@ static struct snd_soc_dai_link zoom2_dai[] = { ...@@ -157,6 +157,7 @@ static struct snd_soc_dai_link zoom2_dai[] = {
/* Audio machine driver */ /* Audio machine driver */
static struct snd_soc_card snd_soc_zoom2 = { static struct snd_soc_card snd_soc_zoom2 = {
.name = "Zoom2", .name = "Zoom2",
.owner = THIS_MODULE,
.dai_link = zoom2_dai, .dai_link = zoom2_dai,
.num_links = ARRAY_SIZE(zoom2_dai), .num_links = ARRAY_SIZE(zoom2_dai),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment