summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-09-11 20:07:30 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-09-12 11:48:12 +0100
commit5013951be88e136d9990ef55303276e2779ce8d8 (patch)
tree55f5563c0d30724c5493a9175bdb9b9e1efd869f
parentc5d2e650bd805a00ff9af537d5b5dede598a198c (diff)
downloadop-kernel-dev-5013951be88e136d9990ef55303276e2779ce8d8.zip
op-kernel-dev-5013951be88e136d9990ef55303276e2779ce8d8.tar.gz
ASoC: Fix trivial build regression in Kirkwood I2S
A fix merged in 3.1-rc2 introduced a small regression, this should get it to build again. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Liam Girdwood <lrg@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/kirkwood/kirkwood-i2s.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 8f16cd3..d0bcf3f 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -424,7 +424,7 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev)
if (!priv->mem) {
dev_err(&pdev->dev, "request_mem_region failed\n");
err = -EBUSY;
- goto error_alloc;
+ goto err_alloc;
}
priv->io = ioremap(priv->mem->start, SZ_16K);
OpenPOWER on IntegriCloud