aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/vt6656/card.c2
-rw-r--r--drivers/staging/vt6656/device.h1
-rw-r--r--drivers/staging/vt6656/main_usb.c3
3 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c
index 34ca2a6799bd..ddf738511869 100644
--- a/drivers/staging/vt6656/card.c
+++ b/drivers/staging/vt6656/card.c
@@ -771,7 +771,7 @@ int vnt_radio_power_on(struct vnt_private *priv)
{
int ret = true;
- if (priv->bHWRadioOff == true || priv->bRadioControlOff == true)
+ if (priv->bHWRadioOff == true)
return false;
priv->bRadioOff = false;
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index 757d500deef1..358c6208db82 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -368,7 +368,6 @@ struct vnt_private {
int bShortSlotTime;
int bBarkerPreambleMd;
- int bRadioControlOff;
int bRadioOff;
/* Power save */
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index ff4e18d2e8f7..68367414080f 100644
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -381,8 +381,7 @@ static int device_init_registers(struct vnt_private *priv)
vnt_mac_reg_bits_on(priv, MAC_REG_GPIOCTL0, 0x01);
- if ((priv->bHWRadioOff == true) ||
- (priv->bRadioControlOff == true)) {
+ if (priv->bHWRadioOff == true) {
vnt_radio_power_off(priv);
} else {
vnt_radio_power_on(priv);