diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2400pci.c')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2400pci.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c index 4ba7b038928f..ad2c98af7e9d 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/rt2x00/rt2400pci.c | |||
| @@ -926,7 +926,7 @@ static void rt2400pci_disable_radio(struct rt2x00_dev *rt2x00dev) | |||
| 926 | static int rt2400pci_set_state(struct rt2x00_dev *rt2x00dev, | 926 | static int rt2400pci_set_state(struct rt2x00_dev *rt2x00dev, |
| 927 | enum dev_state state) | 927 | enum dev_state state) |
| 928 | { | 928 | { |
| 929 | u32 reg; | 929 | u32 reg, reg2; |
| 930 | unsigned int i; | 930 | unsigned int i; |
| 931 | char put_to_sleep; | 931 | char put_to_sleep; |
| 932 | char bbp_state; | 932 | char bbp_state; |
| @@ -947,11 +947,12 @@ static int rt2400pci_set_state(struct rt2x00_dev *rt2x00dev, | |||
| 947 | * device has entered the correct state. | 947 | * device has entered the correct state. |
| 948 | */ | 948 | */ |
| 949 | for (i = 0; i < REGISTER_BUSY_COUNT; i++) { | 949 | for (i = 0; i < REGISTER_BUSY_COUNT; i++) { |
| 950 | rt2x00pci_register_read(rt2x00dev, PWRCSR1, ®); | 950 | rt2x00pci_register_read(rt2x00dev, PWRCSR1, ®2); |
| 951 | bbp_state = rt2x00_get_field32(reg, PWRCSR1_BBP_CURR_STATE); | 951 | bbp_state = rt2x00_get_field32(reg2, PWRCSR1_BBP_CURR_STATE); |
| 952 | rf_state = rt2x00_get_field32(reg, PWRCSR1_RF_CURR_STATE); | 952 | rf_state = rt2x00_get_field32(reg2, PWRCSR1_RF_CURR_STATE); |
| 953 | if (bbp_state == state && rf_state == state) | 953 | if (bbp_state == state && rf_state == state) |
| 954 | return 0; | 954 | return 0; |
| 955 | rt2x00pci_register_write(rt2x00dev, PWRCSR1, reg); | ||
| 955 | msleep(10); | 956 | msleep(10); |
| 956 | } | 957 | } |
| 957 | 958 | ||
