summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCindy H Kao <cindy.h.kao@intel.com>2010-03-30 19:19:37 -0700
committerInaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>2010-05-11 14:04:54 -0700
commit49d72df3f6cd63b49528306a2577ae7a6a0e9d6b (patch)
tree82b6e254c2550f43108c72bea745df9631355fae
parentf22cf689a6353f072bca15d0a26f870e62dfacf8 (diff)
downloadlinux-3.10-49d72df3f6cd63b49528306a2577ae7a6a0e9d6b.tar.gz
linux-3.10-49d72df3f6cd63b49528306a2577ae7a6a0e9d6b.tar.bz2
linux-3.10-49d72df3f6cd63b49528306a2577ae7a6a0e9d6b.zip
wimax/i2400m: correct the error path handlers in dev_start()
This fix is to correct order of the handlers in the error path of dev_start(). When i2400m_firmware_check fails, all the works done before it should be released or cleared. Signed-off-by: Cindy H Kao <cindy.h.kao@intel.com>
-rw-r--r--drivers/net/wimax/i2400m/driver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c
index 94dc83c3969..3a6c8ddb535 100644
--- a/drivers/net/wimax/i2400m/driver.c
+++ b/drivers/net/wimax/i2400m/driver.c
@@ -403,10 +403,10 @@ retry:
error_dev_initialize:
error_check_mac_addr:
+error_fw_check:
i2400m->ready = 0;
wmb(); /* see i2400m->ready's documentation */
flush_workqueue(i2400m->work_queue);
-error_fw_check:
if (i2400m->bus_dev_stop)
i2400m->bus_dev_stop(i2400m);
error_bus_dev_start: