Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36a16d1a authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

ASoC: davinci: 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 30e49530

sound/soc/davinci/davinci-evm.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -242,6 +242,7 @@ static struct snd_soc_dai_link da850_evm_dai = { 
/* davinci dm6446 evm audio machine driver */

/* davinci dm6446 evm audio machine driver */

static struct snd_soc_card dm6446_snd_soc_card_evm = {

static struct snd_soc_card dm6446_snd_soc_card_evm = {

	.name = "DaVinci DM6446 EVM",

	.name = "DaVinci DM6446 EVM",

	.owner = THIS_MODULE,

	.dai_link = &dm6446_evm_dai,

	.dai_link = &dm6446_evm_dai,

	.num_links = 1,

	.num_links = 1,

};

};
@@ -249,6 +250,7 @@ static struct snd_soc_card dm6446_snd_soc_card_evm = { 
/* davinci dm355 evm audio machine driver */

/* davinci dm355 evm audio machine driver */

static struct snd_soc_card dm355_snd_soc_card_evm = {

static struct snd_soc_card dm355_snd_soc_card_evm = {

	.name = "DaVinci DM355 EVM",

	.name = "DaVinci DM355 EVM",

	.owner = THIS_MODULE,

	.dai_link = &dm355_evm_dai,

	.dai_link = &dm355_evm_dai,

	.num_links = 1,

	.num_links = 1,

};

};
@@ -256,6 +258,7 @@ static struct snd_soc_card dm355_snd_soc_card_evm = { 
/* davinci dm365 evm audio machine driver */

/* davinci dm365 evm audio machine driver */

static struct snd_soc_card dm365_snd_soc_card_evm = {

static struct snd_soc_card dm365_snd_soc_card_evm = {

	.name = "DaVinci DM365 EVM",

	.name = "DaVinci DM365 EVM",

	.owner = THIS_MODULE,

	.dai_link = &dm365_evm_dai,

	.dai_link = &dm365_evm_dai,

	.num_links = 1,

	.num_links = 1,

};

};
@@ -263,18 +266,21 @@ static struct snd_soc_card dm365_snd_soc_card_evm = { 
/* davinci dm6467 evm audio machine driver */

/* davinci dm6467 evm audio machine driver */

static struct snd_soc_card dm6467_snd_soc_card_evm = {

static struct snd_soc_card dm6467_snd_soc_card_evm = {

	.name = "DaVinci DM6467 EVM",

	.name = "DaVinci DM6467 EVM",

	.owner = THIS_MODULE,

	.dai_link = dm6467_evm_dai,

	.dai_link = dm6467_evm_dai,

	.num_links = ARRAY_SIZE(dm6467_evm_dai),

	.num_links = ARRAY_SIZE(dm6467_evm_dai),

};

};





static struct snd_soc_card da830_snd_soc_card = {

static struct snd_soc_card da830_snd_soc_card = {

	.name = "DA830/OMAP-L137 EVM",

	.name = "DA830/OMAP-L137 EVM",

	.owner = THIS_MODULE,

	.dai_link = &da830_evm_dai,

	.dai_link = &da830_evm_dai,

	.num_links = 1,

	.num_links = 1,

};

};





static struct snd_soc_card da850_snd_soc_card = {

static struct snd_soc_card da850_snd_soc_card = {

	.name = "DA850/OMAP-L138 EVM",

	.name = "DA850/OMAP-L138 EVM",

	.owner = THIS_MODULE,

	.dai_link = &da850_evm_dai,

	.dai_link = &da850_evm_dai,

	.num_links = 1,

	.num_links = 1,

};

};

sound/soc/davinci/davinci-sffsdr.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -93,6 +93,7 @@ static struct snd_soc_dai_link sffsdr_dai = { 
/* davinci-sffsdr audio machine driver */

/* davinci-sffsdr audio machine driver */

static struct snd_soc_card snd_soc_sffsdr = {

static struct snd_soc_card snd_soc_sffsdr = {

	.name = "DaVinci SFFSDR",

	.name = "DaVinci SFFSDR",

	.owner = THIS_MODULE,

	.dai_link = &sffsdr_dai,

	.dai_link = &sffsdr_dai,

	.num_links = 1,

	.num_links = 1,

};

};