diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-09-14 19:11:13 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-09-14 19:11:13 +0200 |
commit | 4038a12e7443b5fed3e526c475c38c115d9600f6 (patch) | |
tree | b39b8fc13c0761459c6bafa1642c6869c4e5747d /sound/soc/kirkwood/kirkwood-i2s.c | |
parent | ALSA: HDA: Cirrus - fix "Surround Speaker" volume control name (diff) | |
parent | ASoC: Fix trivial build regression in Kirkwood I2S (diff) | |
download | linux-dev-4038a12e7443b5fed3e526c475c38c115d9600f6.tar.xz linux-dev-4038a12e7443b5fed3e526c475c38c115d9600f6.zip |
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 8f16cd37c2af..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_alloc; + goto err_alloc; } priv->io = ioremap(priv->mem->start, SZ_16K); |