diff --git a/hal/rtl8188f/sdio/sdio_halinit.c b/hal/rtl8188f/sdio/sdio_halinit.c index 4f5e85c6..86916a5a 100644 --- a/hal/rtl8188f/sdio/sdio_halinit.c +++ b/hal/rtl8188f/sdio/sdio_halinit.c @@ -627,7 +627,8 @@ static u32 rtl8188fs_hal_init(PADAPTER padapter) PHAL_DATA_TYPE pHalData; struct pwrctrl_priv *pwrctrlpriv; struct registry_priv *pregistrypriv; - struct sreset_priv *psrtpriv; + bool is_sreset_inprogress; + struct dvobj_priv *psdpriv = padapter->dvobj; struct debug_priv *pdbgpriv = &psdpriv->drv_dbg; @@ -639,7 +640,11 @@ static u32 rtl8188fs_hal_init(PADAPTER padapter) u32 u4Tmp; pHalData = GET_HAL_DATA(padapter); - psrtpriv = &pHalData->srestpriv; +#if defined(CONFIG_FWLPS_IN_IPS) + is_sreset_inprogress = &pHalData->srestpriv.silent_reset_inprogress; +#else + is_sreset_inprogress = _FALSE; +#endif pwrctrlpriv = adapter_to_pwrctl(padapter); pregistrypriv = &padapter->registrypriv; @@ -674,8 +679,8 @@ static u32 rtl8188fs_hal_init(PADAPTER padapter) return _SUCCESS; } #elif defined(CONFIG_FWLPS_IN_IPS) - if (adapter_to_pwrctl(padapter)->bips_processing == _TRUE && psrtpriv->silent_reset_inprogress == _FALSE - && adapter_to_pwrctl(padapter)->pre_ips_type == 0) { + if (adapter_to_pwrctl(padapter)->bips_processing == _TRUE && is_sreset_inprogress == _FALSE + && adapter_to_pwrctl(padapter)->pre_ips_type == 0) { systime start_time; u8 cpwm_orig, cpwm_now; u8 val8, bMacPwrCtrlOn = _TRUE; @@ -1050,10 +1055,15 @@ static void CardDisableRTL8188FSdio(PADAPTER padapter) static u32 rtl8188fs_hal_deinit(PADAPTER padapter) { PHAL_DATA_TYPE pHalData = GET_HAL_DATA(padapter); - struct sreset_priv *psrtpriv = &pHalData->srestpriv; + bool is_sreset_inprogress; struct dvobj_priv *psdpriv = padapter->dvobj; struct debug_priv *pdbgpriv = &psdpriv->drv_dbg; +#if defined(CONFIG_FWLPS_IN_IPS) + is_sreset_inprogress = &pHalData->srestpriv.silent_reset_inprogress; +#else + is_sreset_inprogress = _FALSE; +#endif #ifdef CONFIG_MP_INCLUDED if (padapter->registrypriv.mp_mode == 1) MPT_DeInitAdapter(padapter); @@ -1082,7 +1092,7 @@ static u32 rtl8188fs_hal_deinit(PADAPTER padapter) } } else #elif defined(CONFIG_FWLPS_IN_IPS) - if (adapter_to_pwrctl(padapter)->bips_processing == _TRUE && psrtpriv->silent_reset_inprogress == _FALSE) { + if (adapter_to_pwrctl(padapter)->bips_processing == _TRUE && is_sreset_in_progress == _FALSE) { if (padapter->netif_up == _TRUE) { int cnt = 0; u8 val8 = 0;