diff options
author | Cindy H Kao <evans@localhost.localdomain> | 2009-08-17 22:39:12 -0400 |
---|---|---|
committer | Inaky Perez-Gonzalez <inaky@linux.intel.com> | 2009-10-19 02:55:42 -0400 |
commit | 5c29e21d4768a7f1ce46f622b379802edeb1daf3 (patch) | |
tree | 061f6e0f77bb242b11ce42e87ae1fe00c7fc4cd6 | |
parent | f2696fbdb623993a9b4c05455df7ae3158a01111 (diff) |
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 <cindy.h.kao@intel.com>
Signed-off-by: Inaky Perez-Gonzalez <inaky@linux.intel.com>
-rw-r--r-- | drivers/net/wimax/i2400m/sdio.c | 1 |
1 files changed, 0 insertions, 1 deletions
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) | |||
130 | goto function_enabled; | 130 | goto function_enabled; |
131 | } | 131 | } |
132 | d_printf(2, dev, "SDIO function failed to enable: %d\n", err); | 132 | d_printf(2, dev, "SDIO function failed to enable: %d\n", err); |
133 | sdio_disable_func(func); | ||
134 | sdio_release_host(func); | 133 | sdio_release_host(func); |
135 | msleep(I2400MS_INIT_SLEEP_INTERVAL); | 134 | msleep(I2400MS_INIT_SLEEP_INTERVAL); |
136 | } | 135 | } |