diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2400pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2400pci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c index 64328af496f5..e3a2d9070cf6 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/rt2x00/rt2400pci.c | |||
@@ -205,7 +205,7 @@ static int rt2400pci_rfkill_poll(struct rt2x00_dev *rt2x00dev) | |||
205 | u32 reg; | 205 | u32 reg; |
206 | 206 | ||
207 | rt2x00pci_register_read(rt2x00dev, GPIOCSR, ®); | 207 | rt2x00pci_register_read(rt2x00dev, GPIOCSR, ®); |
208 | return rt2x00_get_field32(reg, GPIOCSR_BIT0); | 208 | return rt2x00_get_field32(reg, GPIOCSR_VAL0); |
209 | } | 209 | } |
210 | 210 | ||
211 | #ifdef CONFIG_RT2X00_LIB_LEDS | 211 | #ifdef CONFIG_RT2X00_LIB_LEDS |
@@ -1629,7 +1629,7 @@ static int rt2400pci_probe_hw(struct rt2x00_dev *rt2x00dev) | |||
1629 | * rfkill switch GPIO pin correctly. | 1629 | * rfkill switch GPIO pin correctly. |
1630 | */ | 1630 | */ |
1631 | rt2x00pci_register_read(rt2x00dev, GPIOCSR, ®); | 1631 | rt2x00pci_register_read(rt2x00dev, GPIOCSR, ®); |
1632 | rt2x00_set_field32(®, GPIOCSR_BIT8, 1); | 1632 | rt2x00_set_field32(®, GPIOCSR_DIR0, 1); |
1633 | rt2x00pci_register_write(rt2x00dev, GPIOCSR, reg); | 1633 | rt2x00pci_register_write(rt2x00dev, GPIOCSR, reg); |
1634 | 1634 | ||
1635 | /* | 1635 | /* |
@@ -1789,7 +1789,6 @@ static const struct data_queue_desc rt2400pci_queue_atim = { | |||
1789 | 1789 | ||
1790 | static const struct rt2x00_ops rt2400pci_ops = { | 1790 | static const struct rt2x00_ops rt2400pci_ops = { |
1791 | .name = KBUILD_MODNAME, | 1791 | .name = KBUILD_MODNAME, |
1792 | .max_sta_intf = 1, | ||
1793 | .max_ap_intf = 1, | 1792 | .max_ap_intf = 1, |
1794 | .eeprom_size = EEPROM_SIZE, | 1793 | .eeprom_size = EEPROM_SIZE, |
1795 | .rf_size = RF_SIZE, | 1794 | .rf_size = RF_SIZE, |