|
|
@@ -1,15 +1,15 @@
|
|
|
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
|
|
|
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
|
|
|
-@@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct
|
|
|
+@@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct
|
|
|
rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
|
|
|
}
|
|
|
|
|
|
-static int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
|
|
|
-+static void rt2800pci_read_eeprom_file(struct rt2x00_dev *rt2x00dev)
|
|
|
++static int rt2800pci_read_eeprom_file(struct rt2x00_dev *rt2x00dev)
|
|
|
{
|
|
|
memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
|
|
|
return 0;
|
|
|
-@@ -983,8 +983,9 @@ static int rt2800pci_read_eeprom(struct
|
|
|
+@@ -983,8 +983,9 @@ static int rt2800pci_read_eeprom(struct
|
|
|
{
|
|
|
int retval;
|
|
|
|
|
|
@@ -17,7 +17,7 @@
|
|
|
- retval = rt2800pci_read_eeprom_soc(rt2x00dev);
|
|
|
+ if (rt2x00_is_soc(rt2x00dev) ||
|
|
|
+ test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
|
|
|
-+ rt2800pci_read_eeprom_file(rt2x00dev);
|
|
|
++ retval = rt2800pci_read_eeprom_file(rt2x00dev);
|
|
|
else if (rt2800pci_efuse_detect(rt2x00dev))
|
|
|
retval = rt2800pci_read_eeprom_efuse(rt2x00dev);
|
|
|
else
|