diff options
author | Cindy H Kao <cindy.h.kao@intel.com> | 2010-04-08 19:03:12 -0400 |
---|---|---|
committer | Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> | 2010-05-11 17:05:47 -0400 |
commit | 2354161dd33b204d36caa0bc48c95cc6c1a984fb (patch) | |
tree | 7d1606bfef35ae72dfb823be860ed6b67e9c67ba /drivers/net/wimax | |
parent | 599e59538448ee49d5470f226bb191b2f78aa3a2 (diff) |
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 <cindy.h.kao@intel.com>
Diffstat (limited to 'drivers/net/wimax')
-rw-r--r-- | drivers/net/wimax/i2400m/driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c index d83fe84407bf..39cf96a90d7a 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) | |||
629 | error_dev_start: | 629 | error_dev_start: |
630 | if (i2400m->bus_release) | 630 | if (i2400m->bus_release) |
631 | i2400m->bus_release(i2400m); | 631 | i2400m->bus_release(i2400m); |
632 | error_bus_setup: | ||
633 | /* even if the device was up, it could not be recovered, so we | 632 | /* even if the device was up, it could not be recovered, so we |
634 | * mark it as down. */ | 633 | * mark it as down. */ |
635 | i2400m->updown = 0; | 634 | i2400m->updown = 0; |
636 | wmb(); /* see i2400m->updown's documentation */ | 635 | wmb(); /* see i2400m->updown's documentation */ |
637 | mutex_unlock(&i2400m->init_mutex); | 636 | mutex_unlock(&i2400m->init_mutex); |
637 | error_bus_setup: | ||
638 | d_fnend(3, dev, "(i2400m %p) = %d\n", i2400m, result); | 638 | d_fnend(3, dev, "(i2400m %p) = %d\n", i2400m, result); |
639 | return result; | 639 | return result; |
640 | } | 640 | } |