Commit 561c6a17 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

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: default avatarLothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 5a504963
...@@ -317,6 +317,7 @@ static struct snd_soc_dai_link corgi_dai = { ...@@ -317,6 +317,7 @@ static struct snd_soc_dai_link corgi_dai = {
/* corgi audio machine driver */ /* corgi audio machine driver */
static struct snd_soc_card snd_soc_corgi = { static struct snd_soc_card snd_soc_corgi = {
.name = "Corgi", .name = "Corgi",
.owner = THIS_MODULE,
.dai_link = &corgi_dai, .dai_link = &corgi_dai,
.num_links = 1, .num_links = 1,
}; };
......
...@@ -133,6 +133,7 @@ static struct snd_soc_dai_link e740_dai[] = { ...@@ -133,6 +133,7 @@ static struct snd_soc_dai_link e740_dai[] = {
static struct snd_soc_card e740 = { static struct snd_soc_card e740 = {
.name = "Toshiba e740", .name = "Toshiba e740",
.owner = THIS_MODULE,
.dai_link = e740_dai, .dai_link = e740_dai,
.num_links = ARRAY_SIZE(e740_dai), .num_links = ARRAY_SIZE(e740_dai),
}; };
......
...@@ -116,6 +116,7 @@ static struct snd_soc_dai_link e750_dai[] = { ...@@ -116,6 +116,7 @@ static struct snd_soc_dai_link e750_dai[] = {
static struct snd_soc_card e750 = { static struct snd_soc_card e750 = {
.name = "Toshiba e750", .name = "Toshiba e750",
.owner = THIS_MODULE,
.dai_link = e750_dai, .dai_link = e750_dai,
.num_links = ARRAY_SIZE(e750_dai), .num_links = ARRAY_SIZE(e750_dai),
}; };
......
...@@ -106,6 +106,7 @@ static struct snd_soc_dai_link e800_dai[] = { ...@@ -106,6 +106,7 @@ static struct snd_soc_dai_link e800_dai[] = {
static struct snd_soc_card e800 = { static struct snd_soc_card e800 = {
.name = "Toshiba e800", .name = "Toshiba e800",
.owner = THIS_MODULE,
.dai_link = e800_dai, .dai_link = e800_dai,
.num_links = ARRAY_SIZE(e800_dai), .num_links = ARRAY_SIZE(e800_dai),
}; };
......
...@@ -54,6 +54,7 @@ static struct snd_soc_dai_link em_x270_dai[] = { ...@@ -54,6 +54,7 @@ static struct snd_soc_dai_link em_x270_dai[] = {
static struct snd_soc_card em_x270 = { static struct snd_soc_card em_x270 = {
.name = "EM-X270", .name = "EM-X270",
.owner = THIS_MODULE,
.dai_link = em_x270_dai, .dai_link = em_x270_dai,
.num_links = ARRAY_SIZE(em_x270_dai), .num_links = ARRAY_SIZE(em_x270_dai),
}; };
......
...@@ -169,6 +169,7 @@ static struct snd_soc_dai_link hx4700_dai = { ...@@ -169,6 +169,7 @@ static struct snd_soc_dai_link hx4700_dai = {
/* hx4700 audio machine driver */ /* hx4700 audio machine driver */
static struct snd_soc_card snd_soc_card_hx4700 = { static struct snd_soc_card snd_soc_card_hx4700 = {
.name = "iPAQ hx4700", .name = "iPAQ hx4700",
.owner = THIS_MODULE,
.dai_link = &hx4700_dai, .dai_link = &hx4700_dai,
.num_links = 1, .num_links = 1,
.dapm_widgets = hx4700_dapm_widgets, .dapm_widgets = hx4700_dapm_widgets,
......
...@@ -60,6 +60,7 @@ static struct snd_soc_dai_link imote2_dai = { ...@@ -60,6 +60,7 @@ static struct snd_soc_dai_link imote2_dai = {
static struct snd_soc_card imote2 = { static struct snd_soc_card imote2 = {
.name = "Imote2", .name = "Imote2",
.owner = THIS_MODULE,
.dai_link = &imote2_dai, .dai_link = &imote2_dai,
.num_links = 1, .num_links = 1,
}; };
......
...@@ -452,6 +452,7 @@ static struct snd_soc_dai_link magician_dai[] = { ...@@ -452,6 +452,7 @@ static struct snd_soc_dai_link magician_dai[] = {
/* magician audio machine driver */ /* magician audio machine driver */
static struct snd_soc_card snd_soc_card_magician = { static struct snd_soc_card snd_soc_card_magician = {
.name = "Magician", .name = "Magician",
.owner = THIS_MODULE,
.dai_link = magician_dai, .dai_link = magician_dai,
.num_links = ARRAY_SIZE(magician_dai), .num_links = ARRAY_SIZE(magician_dai),
......
...@@ -181,6 +181,7 @@ static struct snd_soc_dai_link mioa701_dai[] = { ...@@ -181,6 +181,7 @@ static struct snd_soc_dai_link mioa701_dai[] = {
static struct snd_soc_card mioa701 = { static struct snd_soc_card mioa701 = {
.name = "MioA701", .name = "MioA701",
.owner = THIS_MODULE,
.dai_link = mioa701_dai, .dai_link = mioa701_dai,
.num_links = ARRAY_SIZE(mioa701_dai), .num_links = ARRAY_SIZE(mioa701_dai),
}; };
......
...@@ -146,6 +146,7 @@ static struct snd_soc_dai_link palm27x_dai[] = { ...@@ -146,6 +146,7 @@ static struct snd_soc_dai_link palm27x_dai[] = {
static struct snd_soc_card palm27x_asoc = { static struct snd_soc_card palm27x_asoc = {
.name = "Palm/PXA27x", .name = "Palm/PXA27x",
.owner = THIS_MODULE,
.dai_link = palm27x_dai, .dai_link = palm27x_dai,
.num_links = ARRAY_SIZE(palm27x_dai), .num_links = ARRAY_SIZE(palm27x_dai),
}; };
......
...@@ -260,6 +260,7 @@ static struct snd_soc_dai_link snd_soc_raumfeld_speaker_dai[] = ...@@ -260,6 +260,7 @@ static struct snd_soc_dai_link snd_soc_raumfeld_speaker_dai[] =
static struct snd_soc_card snd_soc_raumfeld_connector = { static struct snd_soc_card snd_soc_raumfeld_connector = {
.name = "Raumfeld Connector", .name = "Raumfeld Connector",
.owner = THIS_MODULE,
.dai_link = snd_soc_raumfeld_connector_dai, .dai_link = snd_soc_raumfeld_connector_dai,
.num_links = ARRAY_SIZE(snd_soc_raumfeld_connector_dai), .num_links = ARRAY_SIZE(snd_soc_raumfeld_connector_dai),
.suspend_post = raumfeld_analog_suspend, .suspend_post = raumfeld_analog_suspend,
...@@ -268,6 +269,7 @@ static struct snd_soc_card snd_soc_raumfeld_connector = { ...@@ -268,6 +269,7 @@ static struct snd_soc_card snd_soc_raumfeld_connector = {
static struct snd_soc_card snd_soc_raumfeld_speaker = { static struct snd_soc_card snd_soc_raumfeld_speaker = {
.name = "Raumfeld Speaker", .name = "Raumfeld Speaker",
.owner = THIS_MODULE,
.dai_link = snd_soc_raumfeld_speaker_dai, .dai_link = snd_soc_raumfeld_speaker_dai,
.num_links = ARRAY_SIZE(snd_soc_raumfeld_speaker_dai), .num_links = ARRAY_SIZE(snd_soc_raumfeld_speaker_dai),
.suspend_post = raumfeld_analog_suspend, .suspend_post = raumfeld_analog_suspend,
......
...@@ -125,6 +125,7 @@ static struct snd_soc_dai_link saarb_dai[] = { ...@@ -125,6 +125,7 @@ static struct snd_soc_dai_link saarb_dai[] = {
static struct snd_soc_card snd_soc_card_saarb = { static struct snd_soc_card snd_soc_card_saarb = {
.name = "Saarb", .name = "Saarb",
.owner = THIS_MODULE,
.dai_link = saarb_dai, .dai_link = saarb_dai,
.num_links = ARRAY_SIZE(saarb_dai), .num_links = ARRAY_SIZE(saarb_dai),
}; };
......
...@@ -319,6 +319,7 @@ static struct snd_soc_dai_link spitz_dai = { ...@@ -319,6 +319,7 @@ static struct snd_soc_dai_link spitz_dai = {
/* spitz audio machine driver */ /* spitz audio machine driver */
static struct snd_soc_card snd_soc_spitz = { static struct snd_soc_card snd_soc_spitz = {
.name = "Spitz", .name = "Spitz",
.owner = THIS_MODULE,
.dai_link = &spitz_dai, .dai_link = &spitz_dai,
.num_links = 1, .num_links = 1,
}; };
......
...@@ -125,6 +125,7 @@ static struct snd_soc_dai_link evb3_dai[] = { ...@@ -125,6 +125,7 @@ static struct snd_soc_dai_link evb3_dai[] = {
static struct snd_soc_card snd_soc_card_evb3 = { static struct snd_soc_card snd_soc_card_evb3 = {
.name = "Tavor EVB3", .name = "Tavor EVB3",
.owner = THIS_MODULE,
.dai_link = evb3_dai, .dai_link = evb3_dai,
.num_links = ARRAY_SIZE(evb3_dai), .num_links = ARRAY_SIZE(evb3_dai),
}; };
......
...@@ -236,6 +236,7 @@ static struct snd_soc_dai_link tosa_dai[] = { ...@@ -236,6 +236,7 @@ static struct snd_soc_dai_link tosa_dai[] = {
static struct snd_soc_card tosa = { static struct snd_soc_card tosa = {
.name = "Tosa", .name = "Tosa",
.owner = THIS_MODULE,
.dai_link = tosa_dai, .dai_link = tosa_dai,
.num_links = ARRAY_SIZE(tosa_dai), .num_links = ARRAY_SIZE(tosa_dai),
}; };
......
...@@ -202,6 +202,7 @@ static struct snd_soc_dai_link z2_dai = { ...@@ -202,6 +202,7 @@ static struct snd_soc_dai_link z2_dai = {
/* z2 audio machine driver */ /* z2 audio machine driver */
static struct snd_soc_card snd_soc_z2 = { static struct snd_soc_card snd_soc_z2 = {
.name = "Z2", .name = "Z2",
.owner = THIS_MODULE,
.dai_link = &z2_dai, .dai_link = &z2_dai,
.num_links = 1, .num_links = 1,
}; };
......
...@@ -249,6 +249,7 @@ static int zylonite_resume_pre(struct snd_soc_card *card) ...@@ -249,6 +249,7 @@ static int zylonite_resume_pre(struct snd_soc_card *card)
static struct snd_soc_card zylonite = { static struct snd_soc_card zylonite = {
.name = "Zylonite", .name = "Zylonite",
.owner = THIS_MODULE,
.probe = &zylonite_probe, .probe = &zylonite_probe,
.remove = &zylonite_remove, .remove = &zylonite_remove,
.suspend_post = &zylonite_suspend_post, .suspend_post = &zylonite_suspend_post,
......
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