openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'asoc/topic/au1x' into asoc-next

This commit is contained in:
Mark Brown 2013-08-22 14:28:29 +01:00
parent 04877397af 60db923dad
commit a04a2aca4c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/au1x/db1200.c
View File

@ -73,12 +73,14 @@ static struct snd_soc_dai_link db1300_ac97_dai = {
static struct snd_soc_card db1300_ac97_machine = { static struct snd_soc_card db1300_ac97_machine = {
.name = "DB1300_AC97", .name = "DB1300_AC97",
.owner = THIS_MODULE,
.dai_link = &db1300_ac97_dai, .dai_link = &db1300_ac97_dai,
.num_links = 1, .num_links = 1,
}; };
static struct snd_soc_card db1550_ac97_machine = { static struct snd_soc_card db1550_ac97_machine = {
.name = "DB1550_AC97", .name = "DB1550_AC97",
.owner = THIS_MODULE,
.dai_link = &db1200_ac97_dai, .dai_link = &db1200_ac97_dai,
.num_links = 1, .num_links = 1,
}; };
@ -145,6 +147,7 @@ static struct snd_soc_dai_link db1300_i2s_dai = {
static struct snd_soc_card db1300_i2s_machine = { static struct snd_soc_card db1300_i2s_machine = {
.name = "DB1300_I2S", .name = "DB1300_I2S",
.owner = THIS_MODULE,
.dai_link = &db1300_i2s_dai, .dai_link = &db1300_i2s_dai,
.num_links = 1, .num_links = 1,
}; };
@ -161,6 +164,7 @@ static struct snd_soc_dai_link db1550_i2s_dai = {
static struct snd_soc_card db1550_i2s_machine = { static struct snd_soc_card db1550_i2s_machine = {
.name = "DB1550_I2S", .name = "DB1550_I2S",
.owner = THIS_MODULE,
.dai_link = &db1550_i2s_dai, .dai_link = &db1550_i2s_dai,
.num_links = 1, .num_links = 1,
}; };

3
sound/soc/au1x/psc-ac97.c
View File

@ -379,9 +379,6 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)
mutex_init(&wd->lock); mutex_init(&wd->lock);
iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!iores)
return -ENODEV;
wd->mmio = devm_ioremap_resource(&pdev->dev, iores); wd->mmio = devm_ioremap_resource(&pdev->dev, iores);
if (IS_ERR(wd->mmio)) if (IS_ERR(wd->mmio))
return PTR_ERR(wd->mmio); return PTR_ERR(wd->mmio);