wimax/iwmc3200: don't disable the SDIO function if enable fails
authorCindy H Kao <evans@localhost.localdomain>
Tue, 18 Aug 2009 02:39:12 +0000 (19:39 -0700)
committerInaky Perez-Gonzalez <inaky@linux.intel.com>
Mon, 19 Oct 2009 06:55:42 +0000 (15:55 +0900)
In the iwmc3200, disabling the WiMAX SDIO function when enable fails
would possibly result in a device reset triggered by the iwmc3200's
top controller since it monitors the bus reset activities from each
SDIO function. In any case, the disable makes no sense; if the enable
fails, it should not be disabled.

Thus we remove the unecessary sdio_disable_func() in
i2400ms_enable_function().

Signed-off-by: Cindy H Kao <cindy.h.kao@intel.com>
Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
drivers/net/wimax/i2400m/sdio.c

index 0d64d16..9d6046f 100644 (file)
@@ -130,7 +130,6 @@ int i2400ms_enable_function(struct sdio_func *func)
                        goto function_enabled;
                }
                d_printf(2, dev, "SDIO function failed to enable: %d\n", err);
-               sdio_disable_func(func);
                sdio_release_host(func);
                msleep(I2400MS_INIT_SLEEP_INTERVAL);
        }