These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / vt6656 / power.c

diff --git a/kernel/drivers/staging/vt6656/power.c b/kernel/drivers/staging/vt6656/power.c
index 0ffbaed..13afce2 100644 (file)
--- a/kernel/drivers/staging/vt6656/power.c
+++ b/kernel/drivers/staging/vt6656/power.c
@@ -59,10 +59,9 @@ void vnt_enable_power_saving(struct vnt_private *priv, u16 listen_interval)
        /* set period of power up before TBTT */
        vnt_mac_write_word(priv, MAC_REG_PWBT, C_PWBT);
 
-       if (priv->op_mode != NL80211_IFTYPE_ADHOC) {
+       if (priv->op_mode != NL80211_IFTYPE_ADHOC)
                /* set AID */
                vnt_mac_write_word(priv, MAC_REG_AIDATIM, aid);
-       }
 
        /* Warren:06-18-2004,the sequence must follow
         * PSEN->AUTOSLEEP->GO2DOZE
@@ -85,11 +84,10 @@ void vnt_enable_power_saving(struct vnt_private *priv, u16 listen_interval)
 
                /* first time set listen next beacon */
                vnt_mac_reg_bits_on(priv, MAC_REG_PSCTL, PSCTL_LNBCN);
-       } else {
+       } else
 
                /* always listen beacon */
                vnt_mac_reg_bits_on(priv, MAC_REG_PSCTL, PSCTL_ALBCN);
-       }
 
        dev_dbg(&priv->usb->dev,  "PS:Power Saving Mode Enable...\n");
 }
@@ -109,7 +107,7 @@ void vnt_disable_power_saving(struct vnt_private *priv)
 
        /* disable power saving hw function */
        vnt_control_out(priv, MESSAGE_TYPE_DISABLE_PS, 0,
-                                               0, 0, NULL);
+                       0, 0, NULL);
 
        /* clear AutoSleep */
        vnt_mac_reg_bits_off(priv, MAC_REG_PSCFG, PSCFG_AUTOSLEEP);
@@ -134,7 +132,7 @@ int vnt_next_tbtt_wakeup(struct vnt_private *priv)
        struct ieee80211_conf *conf = &hw->conf;
        int wake_up = false;
 
-       if (conf->listen_interval == 1) {
+       if (conf->listen_interval > 1) {
                /* Turn on wake up to listen next beacon */
                vnt_mac_reg_bits_on(priv, MAC_REG_PSCTL, PSCTL_LNBCN);
                wake_up = true;