Commit 89b90c68 authored by Rickard Strandqvist's avatar Rickard Strandqvist Committed by Greg Kroah-Hartman

staging: rtl8188eu: os_dep: usb_intf.c: Fix to remove null pointer checks that could never happen

Removal of null pointer checks that could never happen
Signed-off-by: default avatarRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d6c455ac
...@@ -306,49 +306,47 @@ int rtw_hw_suspend(struct adapter *padapter) ...@@ -306,49 +306,47 @@ int rtw_hw_suspend(struct adapter *padapter)
goto error_exit; goto error_exit;
} }
if (padapter) { /* system suspend */ /* system suspend */
LeaveAllPowerSaveMode(padapter); LeaveAllPowerSaveMode(padapter);
DBG_88E("==> rtw_hw_suspend\n"); DBG_88E("==> rtw_hw_suspend\n");
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
pwrpriv->bips_processing = true; pwrpriv->bips_processing = true;
/* s1. */ /* s1. */
if (pnetdev) { if (pnetdev) {
netif_carrier_off(pnetdev); netif_carrier_off(pnetdev);
rtw_netif_stop_queue(pnetdev); rtw_netif_stop_queue(pnetdev);
} }
/* s2. */ /* s2. */
rtw_disassoc_cmd(padapter, 500, false); rtw_disassoc_cmd(padapter, 500, false);
/* s2-2. indicate disconnect to os */ /* s2-2. indicate disconnect to os */
{ {
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
if (check_fwstate(pmlmepriv, _FW_LINKED)) { if (check_fwstate(pmlmepriv, _FW_LINKED)) {
_clr_fwstate_(pmlmepriv, _FW_LINKED); _clr_fwstate_(pmlmepriv, _FW_LINKED);
rtw_led_control(padapter, LED_CTL_NO_LINK); rtw_led_control(padapter, LED_CTL_NO_LINK);
rtw_os_indicate_disconnect(padapter); rtw_os_indicate_disconnect(padapter);
/* donnot enqueue cmd */ /* donnot enqueue cmd */
rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 0); rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_DISCONNECT, 0);
}
} }
/* s2-3. */ }
rtw_free_assoc_resources(padapter, 1); /* s2-3. */
rtw_free_assoc_resources(padapter, 1);
/* s2-4. */ /* s2-4. */
rtw_free_network_queue(padapter, true); rtw_free_network_queue(padapter, true);
rtw_ips_dev_unload(padapter); rtw_ips_dev_unload(padapter);
pwrpriv->rf_pwrstate = rf_off; pwrpriv->rf_pwrstate = rf_off;
pwrpriv->bips_processing = false; pwrpriv->bips_processing = false;
_exit_pwrlock(&pwrpriv->lock);
_exit_pwrlock(&pwrpriv->lock);
} else {
goto error_exit;
}
return 0; return 0;
error_exit: error_exit:
...@@ -362,35 +360,32 @@ int rtw_hw_resume(struct adapter *padapter) ...@@ -362,35 +360,32 @@ int rtw_hw_resume(struct adapter *padapter)
struct net_device *pnetdev = padapter->pnetdev; struct net_device *pnetdev = padapter->pnetdev;
if (padapter) { /* system resume */ /* system resume */
DBG_88E("==> rtw_hw_resume\n"); DBG_88E("==> rtw_hw_resume\n");
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
pwrpriv->bips_processing = true; pwrpriv->bips_processing = true;
rtw_reset_drv_sw(padapter); rtw_reset_drv_sw(padapter);
if (pm_netdev_open(pnetdev, false) != 0) { if (pm_netdev_open(pnetdev, false) != 0) {
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
goto error_exit; goto error_exit;
} }
netif_device_attach(pnetdev); netif_device_attach(pnetdev);
netif_carrier_on(pnetdev); netif_carrier_on(pnetdev);
if (!netif_queue_stopped(pnetdev)) if (!netif_queue_stopped(pnetdev))
netif_start_queue(pnetdev); netif_start_queue(pnetdev);
else else
netif_wake_queue(pnetdev); netif_wake_queue(pnetdev);
pwrpriv->bkeepfwalive = false; pwrpriv->bkeepfwalive = false;
pwrpriv->brfoffbyhw = false; pwrpriv->brfoffbyhw = false;
pwrpriv->rf_pwrstate = rf_on; pwrpriv->rf_pwrstate = rf_on;
pwrpriv->bips_processing = false; pwrpriv->bips_processing = false;
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
} else {
goto error_exit;
}
return 0; return 0;
...@@ -501,8 +496,7 @@ int rtw_resume_process(struct adapter *padapter) ...@@ -501,8 +496,7 @@ int rtw_resume_process(struct adapter *padapter)
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
rtw_reset_drv_sw(padapter); rtw_reset_drv_sw(padapter);
if (pwrpriv) pwrpriv->bkeepfwalive = false;
pwrpriv->bkeepfwalive = false;
DBG_88E("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive); DBG_88E("bkeepfwalive(%x)\n", pwrpriv->bkeepfwalive);
if (pm_netdev_open(pnetdev, true) != 0) if (pm_netdev_open(pnetdev, true) != 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment