From e6d0927d9c77a77f3f664a64680411c4ffd17d80 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 23 Oct 2008 13:57:39 +0200
Subject: [PATCH] --- yaml --- r: 117575 b: refs/heads/master c:
 9f50bbad8fc3b0f9fd453ab1e2716b3106d89b13 h: refs/heads/master i:   117573:
 83a4ad0cf8985645cbb8a7784a94bc90b3284fd7   117571:
 a039a65b0594ae1cdc277dc3c7c7e46af39f2f2e   117567:
 309c637e95e404b2abb779ea9daad4b1817b3b29 v: v3

---
 [refs]                                        | 2 +-
 trunk/sound/aoa/soundbus/i2sbus/i2sbus-core.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0f9d3e6f1049..883954133c8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13095c37b29b90ec96070cb63400a79737b4a185
+refs/heads/master: 9f50bbad8fc3b0f9fd453ab1e2716b3106d89b13
diff --git a/trunk/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/trunk/sound/aoa/soundbus/i2sbus/i2sbus-core.c
index e6beb92c6933..b4590df07466 100644
--- a/trunk/sound/aoa/soundbus/i2sbus/i2sbus-core.c
+++ b/trunk/sound/aoa/soundbus/i2sbus/i2sbus-core.c
@@ -159,7 +159,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
 	struct i2sbus_dev *dev;
 	struct device_node *child = NULL, *sound = NULL;
 	struct resource *r;
-	int i, layout = 0, rlen;
+	int i, layout = 0, rlen, ok = force;
 	static const char *rnames[] = { "i2sbus: %s (control)",
 					"i2sbus: %s (tx)",
 					"i2sbus: %s (rx)" };
@@ -192,7 +192,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
 			layout = *layout_id;
 			snprintf(dev->sound.modalias, 32,
 				 "sound-layout-%d", layout);
-			force = 1;
+			ok = 1;
 		}
 	}
 	/* for the time being, until we can handle non-layout-id
@@ -201,7 +201,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
 	 * When there are two i2s busses and only one has a layout-id,
 	 * then this depends on the order, but that isn't important
 	 * either as the second one in that case is just a modem. */
-	if (!force) {
+	if (!ok) {
 		kfree(dev);
 		return -ENODEV;
 	}