From: Cindy H Kao Date: Thu, 8 Apr 2010 23:03:12 +0000 (-0700) Subject: wimax/i2400m: Correct the error path handlers order in i2400m_post_reset() X-Git-Tag: v2.6.35-rc1~473^2~99^2~17 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=2354161dd33b204d36caa0bc48c95cc6c1a984fb;p=~emulex%2Finfiniband.git wimax/i2400m: Correct the error path handlers order in i2400m_post_reset() When bus_setup fails in i2400m_post_reset(), it falls to the error path handler "error_bus_setup:" which includes unlock the mutext. However, we didn't ever try to the obtain the lock when running bus_setup. The patch is to fix the misplaced error path handler "error_bus_setup:". Signed-off-by: Cindy H Kao --- diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c index d83fe84407b..39cf96a90d7 100644 --- a/drivers/net/wimax/i2400m/driver.c +++ b/drivers/net/wimax/i2400m/driver.c @@ -629,12 +629,12 @@ int i2400m_post_reset(struct i2400m *i2400m) error_dev_start: if (i2400m->bus_release) i2400m->bus_release(i2400m); -error_bus_setup: /* even if the device was up, it could not be recovered, so we * mark it as down. */ i2400m->updown = 0; wmb(); /* see i2400m->updown's documentation */ mutex_unlock(&i2400m->init_mutex); +error_bus_setup: d_fnend(3, dev, "(i2400m %p) = %d\n", i2400m, result); return result; }