]> git.karo-electronics.de Git - linux-beck.git/commitdiff
wimax/i2400m: Correct the error path handlers order in i2400m_post_reset()
authorCindy H Kao <cindy.h.kao@intel.com>
Thu, 8 Apr 2010 23:03:12 +0000 (16:03 -0700)
committerInaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
Tue, 11 May 2010 21:05:47 +0000 (14:05 -0700)
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>
drivers/net/wimax/i2400m/driver.c

index d83fe84407bf80be627731b178cd5682dc3e56d2..39cf96a90d7a9674130f876555a653640aad7db7 100644 (file)
@@ -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;
 }