aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00.h1
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00dev.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 3e177175e34b..4c76c8d93cb5 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -594,7 +594,6 @@ enum rt2x00_flags {
594 DEVICE_STATE_INITIALIZED, 594 DEVICE_STATE_INITIALIZED,
595 DEVICE_STATE_STARTED, 595 DEVICE_STATE_STARTED,
596 DEVICE_STATE_ENABLED_RADIO, 596 DEVICE_STATE_ENABLED_RADIO,
597 DEVICE_STATE_DISABLED_RADIO_HW,
598 597
599 /* 598 /*
600 * Driver requirements 599 * Driver requirements
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 4fff3a83f7df..658a63bfb761 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -40,8 +40,7 @@ int rt2x00lib_enable_radio(struct rt2x00_dev *rt2x00dev)
40 * Don't enable the radio twice. 40 * Don't enable the radio twice.
41 * And check if the hardware button has been disabled. 41 * And check if the hardware button has been disabled.
42 */ 42 */
43 if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags) || 43 if (test_bit(DEVICE_STATE_ENABLED_RADIO, &rt2x00dev->flags))
44 test_bit(DEVICE_STATE_DISABLED_RADIO_HW, &rt2x00dev->flags))
45 return 0; 44 return 0;
46 45
47 /* 46 /*