aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-08-22 14:28:55 +0100
committerMark Brown <broonie@linaro.org>2013-08-22 14:28:55 +0100
commitdc52399bdffec0fd019dbfe1bc8df8b79453ed30 (patch)
treed9a74016a9c485aee6a1c0247c91693d7bc25447 /sound
parentb7e8bbf29d9c90a301ca0060186af687992566d8 (diff)
parent06c77ea65b867e9b7ced67636b9a2854e0ce8558 (diff)
downloadlinux-dc52399bdffec0fd019dbfe1bc8df8b79453ed30.tar.gz
Merge remote-tracking branch 'asoc/topic/txx9' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/txx9/txx9aclc-ac97.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/sound/soc/txx9/txx9aclc-ac97.c b/sound/soc/txx9/txx9aclc-ac97.c
index 4bcce8a3cdedd6..e0305a1485680b 100644
--- a/sound/soc/txx9/txx9aclc-ac97.c
+++ b/sound/soc/txx9/txx9aclc-ac97.c
@@ -184,9 +184,6 @@ static int txx9aclc_ac97_dev_probe(struct platform_device *pdev)
if (irq < 0)
return irq;
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!r)
- return -EBUSY;
-
drvdata->base = devm_ioremap_resource(&pdev->dev, r);
if (IS_ERR(drvdata->base))
return PTR_ERR(drvdata->base);