X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fmac80211%2Fpatches%2F605-rt2x00-pci-eeprom.patch;h=ec58597752843bee8939927865569641fb30e40d;hp=088d4740927aa3000fc6f52fb1d9dd105aca80bc;hb=a81af1e631d0a1a552391c86b560d9bf1cfa956e;hpb=e194f60a49979616867b44d249156e37728b3cbd

diff --git a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
index 088d474092..ec58597752 100644
--- a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
+++ b/package/mac80211/patches/605-rt2x00-pci-eeprom.patch
@@ -1,6 +1,6 @@
 --- 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);
  }
  
@@ -9,14 +9,14 @@
  {
  	memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE);
  }
-@@ -938,8 +938,9 @@ static int rt2800pci_validate_eeprom(str
- 	/*
- 	 * Read EEPROM into buffer
- 	 */
+@@ -976,8 +976,9 @@ static irqreturn_t rt2800pci_interrupt(i
+  */
+ static void rt2800pci_read_eeprom(struct rt2x00_dev *rt2x00dev)
+ {
 -	if (rt2x00_is_soc(rt2x00dev))
 -		rt2800pci_read_eeprom_soc(rt2x00dev);
 +	if (rt2x00_is_soc(rt2x00dev) ||
-+			test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
++	    test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
 +		rt2800pci_read_eeprom_file(rt2x00dev);
  	else if (rt2800pci_efuse_detect(rt2x00dev))
  		rt2800pci_read_eeprom_efuse(rt2x00dev);
@@ -30,8 +30,8 @@
 +	struct rt2x00_platform_data *pdata;
  	struct rt2x00_dev *rt2x00dev;
  	int retval;
- 
-@@ -299,6 +300,12 @@ int rt2x00pci_probe(struct pci_dev *pci_
+ 	u16 chip;
+@@ -300,6 +301,12 @@ int rt2x00pci_probe(struct pci_dev *pci_
  	rt2x00dev->irq = pci_dev->irq;
  	rt2x00dev->name = pci_name(pci_dev);