OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c5d2e65
)
ASoC: Fix trivial build regression in Kirkwood I2S
author
Arnd Bergmann
<arnd@arndb.de>
Sun, 11 Sep 2011 18:07:30 +0000
(20:07 +0200)
committer
Mark Brown
<broonie@opensource.wolfsonmicro.com>
Mon, 12 Sep 2011 10:48:12 +0000
(11:48 +0100)
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>
sound/soc/kirkwood/kirkwood-i2s.c
patch
|
blob
|
history
diff --git
a/sound/soc/kirkwood/kirkwood-i2s.c
b/sound/soc/kirkwood/kirkwood-i2s.c
index
8f16cd3
..
d0bcf3f
100644
(file)
--- 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 err
or
_alloc;
+ goto err_alloc;
}
priv->io = ioremap(priv->mem->start, SZ_16K);