From: Cindy H Kao Date: Tue, 18 Aug 2009 02:39:12 +0000 (-0700) Subject: wimax/iwmc3200: don't disable the SDIO function if enable fails X-Git-Tag: v2.6.33-rc1~388^2~487^2~54 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5c29e21d4768a7f1ce46f622b379802edeb1daf3;p=karo-tx-linux.git wimax/iwmc3200: don't disable the SDIO function if enable fails 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 Signed-off-by: Inaky Perez-Gonzalez --- diff --git a/drivers/net/wimax/i2400m/sdio.c b/drivers/net/wimax/i2400m/sdio.c index 0d64d16bd264..9d6046f58cae 100644 --- a/drivers/net/wimax/i2400m/sdio.c +++ b/drivers/net/wimax/i2400m/sdio.c @@ -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); }