summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-22 13:28:44 (GMT)
committerMark Brown <broonie@linaro.org>2013-08-22 13:28:44 (GMT)
commit49ffa3b1b211f3404a401bce0d8618f4c41ff01e (patch)
tree999656930af86bc5b481e19e2da94ce5361f4027 /sound/soc
parentc8a538417e2b6f0a68127cdcbbd0790b3bd250cf (diff)
parent916dd4130c9d045b8b50c16211b4d68ce147e50f (diff)
downloadlinux-49ffa3b1b211f3404a401bce0d8618f4c41ff01e.tar.xz
Merge remote-tracking branch 'asoc/topic/nuc900' into asoc-next
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/nuc900/nuc900-ac97.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/nuc900/nuc900-ac97.c b/sound/soc/nuc900/nuc900-ac97.c
index f4c2417..8987bf9 100644
--- a/sound/soc/nuc900/nuc900-ac97.c
+++ b/sound/soc/nuc900/nuc900-ac97.c
@@ -333,9 +333,6 @@ static int nuc900_ac97_drvprobe(struct platform_device *pdev)
spin_lock_init(&nuc900_audio->lock);
nuc900_audio->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!nuc900_audio->res)
- return ret;
-
nuc900_audio->mmio = devm_ioremap_resource(&pdev->dev,
nuc900_audio->res);
if (IS_ERR(nuc900_audio->mmio))