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

2 files changed, 4 insertions, 3 deletions

diff --git a/sound/soc/au1x/db1200.c b/sound/soc/au1x/db1200.c
index a497a0cfeba1..decba87a074c 100644
--- a/sound/soc/au1x/db1200.c
+++ b/sound/soc/au1x/db1200.c
@@ -73,12 +73,14 @@ static struct snd_soc_dai_link db1300_ac97_dai = {
 
 static struct snd_soc_card db1300_ac97_machine = {
         .name           = "DB1300_AC97",
+        .owner          = THIS_MODULE,
         .dai_link       = &db1300_ac97_dai,
         .num_links      = 1,
 };
 
 static struct snd_soc_card db1550_ac97_machine = {
         .name           = "DB1550_AC97",
+        .owner          = THIS_MODULE,
         .dai_link       = &db1200_ac97_dai,
         .num_links      = 1,
 };
@@ -145,6 +147,7 @@ static struct snd_soc_dai_link db1300_i2s_dai = {
 
 static struct snd_soc_card db1300_i2s_machine = {
         .name           = "DB1300_I2S",
+        .owner          = THIS_MODULE,
         .dai_link       = &db1300_i2s_dai,
         .num_links      = 1,
 };
@@ -161,6 +164,7 @@ static struct snd_soc_dai_link db1550_i2s_dai = {
 
 static struct snd_soc_card db1550_i2s_machine = {
         .name           = "DB1550_I2S",
+        .owner          = THIS_MODULE,
         .dai_link       = &db1550_i2s_dai,
         .num_links      = 1,
 };
diff --git a/sound/soc/au1x/psc-ac97.c b/sound/soc/au1x/psc-ac97.c
index a822ab822bb7..986dcec79fa0 100644
--- a/sound/soc/au1x/psc-ac97.c
+++ b/sound/soc/au1x/psc-ac97.c
@@ -379,9 +379,6 @@ static int au1xpsc_ac97_drvprobe(struct platform_device *pdev)
         mutex_init(&wd->lock);
 
         iores = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!iores)
-                return -ENODEV;
-
         wd->mmio = devm_ioremap_resource(&pdev->dev, iores);
         if (IS_ERR(wd->mmio))
                 return PTR_ERR(wd->mmio);