mac80211: rt2x00: fix PCI eeprom patch

[librecmc/librecmc.git] / package / mac80211 / patches / 605-rt2x00-pci-eeprom.patch

diff --git a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
index c2b46fd966d80122222be51566715f8028024d36..25b21cecead46919f3a0478e783b9114bda07101 100644 (file)
--- a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
+++ b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
@@ -1,25 +1,25 @@
 --- a/drivers/net/wireless/rt2x00/rt2800pci.c
 +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -84,7 +84,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 void rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
-+static void rt2800pci_read_eeprom_file(struct rt2x00_dev *rt2x00dev)
+-static int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev)
++static int rt2800pci_read_eeprom_file(struct rt2x00_dev *rt2x00dev)
  {
        memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
- }
-@@ -974,8 +974,9 @@ static int rt2800pci_validate_eeprom(str
-       /*
-        * Read EEPROM into buffer
-        */
+       return 0;
+@@ -983,8 +983,9 @@ static int rt2800pci_read_eeprom(struct
+ {
+       int retval;
+ 
 -      if (rt2x00_is_soc(rt2x00dev))
--              rt2800pci_read_eeprom_soc(rt2x00dev);
+-              retval = rt2800pci_read_eeprom_soc(rt2x00dev);
 +      if (rt2x00_is_soc(rt2x00dev) ||
-+                      test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
-+              rt2800pci_read_eeprom_file(rt2x00dev);
++          test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
++              retval = rt2800pci_read_eeprom_file(rt2x00dev);
        else if (rt2800pci_efuse_detect(rt2x00dev))
-               rt2800pci_read_eeprom_efuse(rt2x00dev);
+               retval = rt2800pci_read_eeprom_efuse(rt2x00dev);
        else
 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c