diff --git a/[refs] b/[refs] index 17251226c5f8..27b7d7361e3c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4721213fdde4456a36a5e63f02e5c2556a4df398 +refs/heads/master: 0628817accc305201fc0e1b7f020dec618c868cc diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c index 3c6cd774192d..950c4257f421 100644 --- a/trunk/drivers/net/wireless/wl12xx/main.c +++ b/trunk/drivers/net/wireless/wl12xx/main.c @@ -157,8 +157,6 @@ static void wl12xx_fw_wakeup(struct wl12xx *wl) if (!(elp_reg & ELPCTRL_WLAN_READY)) { wl12xx_warning("WLAN not ready"); - elp_reg = ELPCTRL_WAKE_UP_WLAN_READY; - wl12xx_write32(wl, HW_ACCESS_ELP_CTRL_REG_ADDR, elp_reg); } }