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 --- On Saturday 20 August 2011 08:12:38 Julia Lawall wrote:
From: Julia Lawall julia@diku.dk
Adjust the goto to jump to the error handling code that includes kfree.
/home/arnd/linux-arm/sound/soc/kirkwood/kirkwood-i2s.c: In function 'kirkwood_i2s_dev_probe': /home/arnd/linux-arm/sound/soc/kirkwood/kirkwood-i2s.c:427:3: error: label 'error_alloc' used but not defined
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);