Merge tag 'for-linus-20151106' of git://git.infradead.org/linux-mtd

[firefly-linux-kernel-4.4.55.git] / drivers / staging / rtl8712 / rtl871x_pwrctrl.c

diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.c b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
index 9bc04f474d18d7c79311c8bd6fc80b48015a6550..bf10d6db50e8ba1e638cd3124d83710477d5203d 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_pwrctrl.c
+++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.c
@@ -44,8 +44,7 @@ void r8712_set_rpwm(struct _adapter *padapter, u8 val8)
                if (pwrpriv->rpwm_retry == 0)
                        return;
        }
-       if ((padapter->bDriverStopped == true) ||
-           (padapter->bSurpriseRemoved == true))
+       if (padapter->bDriverStopped || padapter->bSurpriseRemoved)
                return;
        rpwm = val8 | pwrpriv->tog;
        switch (val8) {
@@ -129,8 +128,7 @@ static void _rpwm_check_handler (struct _adapter *padapter)
 {
        struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;
 
-       if (padapter->bDriverStopped == true ||
-           padapter->bSurpriseRemoved == true)
+       if (padapter->bDriverStopped || padapter->bSurpriseRemoved)
                return;
        if (pwrpriv->cpwm != pwrpriv->rpwm)
                schedule_work(&pwrpriv->rpwm_workitem);