diff options
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd.h | 4 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/dhd_linux.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/bcmdhd/wl_android.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/bcmdhd/dhd.h b/drivers/net/wireless/bcmdhd/dhd.h index 0a6b328ffbe0..46e326393325 100644 --- a/drivers/net/wireless/bcmdhd/dhd.h +++ b/drivers/net/wireless/bcmdhd/dhd.h @@ -93,10 +93,10 @@ enum dhd_bus_state { #define DHD_SCAN_PASSIVE_TIME 130 /* ms: Embedded default Passive setting from DHD Driver */ #ifndef POWERUP_MAX_RETRY -#define POWERUP_MAX_RETRY (10) /* how many times we retry to power up the chip */ +#define POWERUP_MAX_RETRY 3 /* how many times we retry to power up the chip */ #endif #ifndef POWERUP_WAIT_MS -#define POWERUP_WAIT_MS (2000) /* ms: time out in waiting wifi to come up */ +#define POWERUP_WAIT_MS 2000 /* ms: time out in waiting wifi to come up */ #endif enum dhd_bus_wake_state { diff --git a/drivers/net/wireless/bcmdhd/dhd_linux.c b/drivers/net/wireless/bcmdhd/dhd_linux.c index 4e33dc78d0ce..15ca8fbe6742 100644 --- a/drivers/net/wireless/bcmdhd/dhd_linux.c +++ b/drivers/net/wireless/bcmdhd/dhd_linux.c @@ -2460,7 +2460,7 @@ dhd_open(struct net_device *net) firmware_path[0] = '\0'; } - dhd->pub.dongle_trap_occured = 0;
+ dhd->pub.dongle_trap_occured = 0; dhd->pub.hang_was_sent = 0; #if !defined(WL_CFG80211) /* @@ -3897,7 +3897,7 @@ void dhd_detach(dhd_pub_t *dhdp) if (dhd->dhd_state & DHD_ATTACH_STATE_WAKELOCKS_INIT) { #ifdef CONFIG_HAS_WAKELOCK dhd->wakelock_counter = 0; - dhd->wakelock_rx_timeout_enable = 0;
+ dhd->wakelock_rx_timeout_enable = 0; dhd->wakelock_ctrl_timeout_enable = 0; wake_lock_destroy(&dhd->wl_wifi); wake_lock_destroy(&dhd->wl_rxwake); @@ -4001,7 +4001,7 @@ dhd_module_init(void) break; } DHD_ERROR(("\nfailed to power up wifi chip, retry again (%d left) **\n\n", - retry+1)); + retry)); dhd_bus_unreg_sdio_notify(); #if defined(CONFIG_WIFI_CONTROL_FUNC) wl_android_wifictrl_func_del(); diff --git a/drivers/net/wireless/bcmdhd/wl_android.c b/drivers/net/wireless/bcmdhd/wl_android.c index 9157a21f6b21..0ab637d77101 100644 --- a/drivers/net/wireless/bcmdhd/wl_android.c +++ b/drivers/net/wireless/bcmdhd/wl_android.c @@ -391,7 +391,7 @@ int wl_android_wifi_on(struct net_device *dev) if (ret == 0) break; DHD_ERROR(("\nfailed to power up wifi chip, retry again (%d left) **\n\n", - retry+1)); + retry)); dhd_customer_gpio_wlan_ctrl(WLAN_RESET_OFF); } while (retry-- >= 0); if (ret != 0) { |