mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
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>
This commit is contained in:
parent
5a5049637c
commit
561c6a172f
17 changed files with 18 additions and 0 deletions
|
@ -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,
|
||||
};
|
||||
|
|
|
@ -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),
|
||||
};
|
||||
|
|
|
@ -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),
|
||||
};
|
||||
|
|
|
@ -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),
|
||||
};
|
||||
|
|
|
@ -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),
|
||||
};
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
|
|
@ -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),
|
||||
|
||||
|
|
|
@ -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),
|
||||
};
|
||||
|
|
|
@ -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),
|
||||
};
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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),
|
||||
};
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
|
|
@ -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),
|
||||
};
|
||||
|
|
|
@ -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),
|
||||
};
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue