diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-09-16 08:29:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-09-16 08:29:04 +0200 |
| commit | 0308110615acb4b6409fe042caf22bb9fb075d85 (patch) | |
| tree | d129f11ebdbe49b21246a72e6ba52c50e81e8e7e /sound/soc/kirkwood/kirkwood-i2s.c | |
| parent | c731bc96ad641a5fa3d50a87b474652505507282 (diff) | |
| parent | 763437a9e7737535b2fc72175ad4974048769be6 (diff) | |
Merge branch 'fix/misc' into topic/misc
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 a33fc51f363b..d0bcf3fcea01 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 err_alloc; } priv->io = ioremap(priv->mem->start, SZ_16K); |