forked from Minki/linux
ASoC: samsung: 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
561c6a172f
commit
095d79dc49
@ -244,6 +244,7 @@ static struct snd_soc_dai_link goni_dai[] = {
|
||||
|
||||
static struct snd_soc_card goni = {
|
||||
.name = "goni",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = goni_dai,
|
||||
.num_links = ARRAY_SIZE(goni_dai),
|
||||
|
||||
|
@ -215,6 +215,7 @@ static struct snd_soc_dai_link h1940_uda1380_dai[] = {
|
||||
|
||||
static struct snd_soc_card h1940_asoc = {
|
||||
.name = "h1940",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = h1940_uda1380_dai,
|
||||
.num_links = ARRAY_SIZE(h1940_uda1380_dai),
|
||||
|
||||
|
@ -127,6 +127,7 @@ static struct snd_soc_dai_link jive_dai = {
|
||||
/* jive audio machine driver */
|
||||
static struct snd_soc_card snd_soc_machine_jive = {
|
||||
.name = "Jive",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = &jive_dai,
|
||||
.num_links = 1,
|
||||
|
||||
|
@ -194,6 +194,7 @@ static int littlemill_late_probe(struct snd_soc_card *card)
|
||||
|
||||
static struct snd_soc_card littlemill = {
|
||||
.name = "Littlemill",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = littlemill_dai,
|
||||
.num_links = ARRAY_SIZE(littlemill_dai),
|
||||
|
||||
|
@ -34,6 +34,7 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = {
|
||||
|
||||
static struct snd_soc_card ln2440sbc = {
|
||||
.name = "LN2440SBC",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = ln2440sbc_dai,
|
||||
.num_links = ARRAY_SIZE(ln2440sbc_dai),
|
||||
};
|
||||
|
@ -177,6 +177,7 @@ static struct snd_soc_dapm_route audio_paths[] = {
|
||||
|
||||
static struct snd_soc_card lowland = {
|
||||
.name = "Lowland",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = lowland_dai,
|
||||
.num_links = ARRAY_SIZE(lowland_dai),
|
||||
.aux_dev = lowland_aux_dev,
|
||||
|
@ -465,6 +465,7 @@ static const struct gpio neo1973_gta02_gpios[] = {};
|
||||
|
||||
static struct snd_soc_card neo1973 = {
|
||||
.name = "neo1973",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = neo1973_dai,
|
||||
.num_links = ARRAY_SIZE(neo1973_dai),
|
||||
.aux_dev = neo1973_aux_devs,
|
||||
|
@ -114,6 +114,7 @@ static const struct snd_soc_dapm_route audio_map[] = {
|
||||
|
||||
static struct snd_soc_card rx1950_asoc = {
|
||||
.name = "rx1950",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = rx1950_uda1380_dai,
|
||||
.num_links = ARRAY_SIZE(rx1950_uda1380_dai),
|
||||
|
||||
|
@ -89,6 +89,7 @@ static struct snd_soc_dai_link simtec_dai_aic33 = {
|
||||
/* simtec audio machine driver */
|
||||
static struct snd_soc_card snd_soc_machine_simtec_aic33 = {
|
||||
.name = "Simtec-Hermes",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = &simtec_dai_aic33,
|
||||
.num_links = 1,
|
||||
|
||||
|
@ -78,6 +78,7 @@ static struct snd_soc_dai_link simtec_dai_aic23 = {
|
||||
/* simtec audio machine driver */
|
||||
static struct snd_soc_card snd_soc_machine_simtec_aic23 = {
|
||||
.name = "Simtec",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = &simtec_dai_aic23,
|
||||
.num_links = 1,
|
||||
|
||||
|
@ -229,6 +229,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = {
|
||||
|
||||
static struct snd_soc_card snd_soc_s3c24xx_uda134x = {
|
||||
.name = "S3C24XX_UDA134X",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = &s3c24xx_uda134x_dai_link,
|
||||
.num_links = 1,
|
||||
};
|
||||
|
@ -198,6 +198,7 @@ static struct snd_soc_dai_link smartq_dai[] = {
|
||||
|
||||
static struct snd_soc_card snd_soc_smartq = {
|
||||
.name = "SmartQ",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = smartq_dai,
|
||||
.num_links = ARRAY_SIZE(smartq_dai),
|
||||
|
||||
|
@ -30,6 +30,7 @@ static struct snd_soc_dai_link smdk2443_dai[] = {
|
||||
|
||||
static struct snd_soc_card smdk2443 = {
|
||||
.name = "SMDK2443",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = smdk2443_dai,
|
||||
.num_links = ARRAY_SIZE(smdk2443_dai),
|
||||
};
|
||||
|
@ -160,6 +160,7 @@ static struct snd_soc_dai_link smdk_dai = {
|
||||
|
||||
static struct snd_soc_card smdk = {
|
||||
.name = "SMDK-S/PDIF",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = &smdk_dai,
|
||||
.num_links = 1,
|
||||
};
|
||||
|
@ -203,6 +203,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
|
||||
|
||||
static struct snd_soc_card smdk = {
|
||||
.name = "SMDK-I2S",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = smdk_dai,
|
||||
.num_links = 2,
|
||||
|
||||
|
@ -143,6 +143,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
|
||||
|
||||
static struct snd_soc_card smdk_pcm = {
|
||||
.name = "SMDK-PCM",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = smdk_dai,
|
||||
.num_links = 2,
|
||||
};
|
||||
|
@ -144,6 +144,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
|
||||
|
||||
static struct snd_soc_card smdk = {
|
||||
.name = "SMDK-I2S",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = smdk_dai,
|
||||
.num_links = ARRAY_SIZE(smdk_dai),
|
||||
};
|
||||
|
@ -124,6 +124,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
|
||||
|
||||
static struct snd_soc_card smdk_pcm = {
|
||||
.name = "SMDK-PCM",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = smdk_dai,
|
||||
.num_links = 1,
|
||||
};
|
||||
|
@ -50,6 +50,7 @@ static struct snd_soc_dai_link smdk_dai = {
|
||||
|
||||
static struct snd_soc_card smdk = {
|
||||
.name = "SMDK WM9713",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = &smdk_dai,
|
||||
.num_links = 1,
|
||||
};
|
||||
|
@ -291,6 +291,7 @@ static struct snd_soc_dapm_route audio_paths[] = {
|
||||
|
||||
static struct snd_soc_card speyside = {
|
||||
.name = "Speyside",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = speyside_dai,
|
||||
.num_links = ARRAY_SIZE(speyside_dai),
|
||||
.aux_dev = speyside_aux_dev,
|
||||
|
@ -196,6 +196,7 @@ static int tobermory_late_probe(struct snd_soc_card *card)
|
||||
|
||||
static struct snd_soc_card tobermory = {
|
||||
.name = "Tobermory",
|
||||
.owner = THIS_MODULE,
|
||||
.dai_link = tobermory_dai,
|
||||
.num_links = ARRAY_SIZE(tobermory_dai),
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user