diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-08-26 09:29:43 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-08-26 09:29:43 +0200 |
| commit | 26b9b559ed9ff3bef5642ef731748d28d894705f (patch) | |
| tree | 9145782f06f68f88c004828d5f85d8d772d1cde6 /sound/soc/kirkwood/kirkwood-i2s.c | |
| parent | 468c5458856236cde6df1b0654d32bf6625349a5 (diff) | |
| parent | 18036b5866b5e407a28f444a80de186a5d7df767 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/kirkwood/kirkwood-i2s.c')
| -rw-r--r-- | sound/soc/kirkwood/kirkwood-i2s.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index a33fc51f363..8f16cd37c2a 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; + goto error_alloc; } priv->io = ioremap(priv->mem->start, SZ_16K); |