git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
[pandora-kernel.git]
/
sound
/
soc
/
kirkwood
/
kirkwood-i2s.c
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;
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);
}
priv->io = ioremap(priv->mem->start, SZ_16K);