At Thu, 23 Oct 2008 13:57:39 +0200, Johannes Berg wrote:

We shouldn't modify a global variable here.

Signed-off-by: Johannes Berg johannes@sipsolutions.net

Applied. This seems a good thing to go to 2.6.28, so I'll put it to the next pull request.

thanks,

Takashi

---

sound/aoa/soundbus/i2sbus/i2sbus-core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

--- everything.orig/sound/aoa/soundbus/i2sbus/i2sbus-core.c 2008-10-23 13:55:14.000000000 +0200 +++ everything/sound/aoa/soundbus/i2sbus/i2sbus-core.c 2008-10-23 13:55:33.000000000 +0200 @@ -159,7 +159,7 @@ static int i2sbus_add_dev(struct macio_d 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_d 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_d * 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; }