From c47ff727da41151098cdb875d83869bae5baa573 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Sun, 11 Sep 2011 20:07:30 +0200
Subject: [PATCH] --- yaml --- r: 263859 b: refs/heads/master c:
 5013951be88e136d9990ef55303276e2779ce8d8 h: refs/heads/master i:   263857:
 e9007aa6dd655e4aaa901864220a6af2daaf5442   263855:
 754fb131e62c8b1850db45118b47779ee8ef3149 v: v3

---
 [refs]                                  | 2 +-
 trunk/sound/soc/kirkwood/kirkwood-i2s.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cfd534ea0539..46986e1e3103 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5d2e650bd805a00ff9af537d5b5dede598a198c
+refs/heads/master: 5013951be88e136d9990ef55303276e2779ce8d8
diff --git a/trunk/sound/soc/kirkwood/kirkwood-i2s.c b/trunk/sound/soc/kirkwood/kirkwood-i2s.c
index 8f16cd37c2af..d0bcf3fcea01 100644
--- a/trunk/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/trunk/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);