mac80211: rt2x00: fix PCI eeprom patch
authorGabor Juhos <juhosg@openwrt.org>
Sun, 13 Jan 2013 20:44:14 +0000 (20:44 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Sun, 13 Jan 2013 20:44:14 +0000 (20:44 +0000)
Fixes the following warnings:

  CC [M] <...>/drivers/net/wireless/rt2x00/rt2800pci.o
<...>/drivers/net/wireless/rt2x00/rt2800pci.c: In function 'rt2800pci_read_eeprom_file':
<...>/drivers/net/wireless/rt2x00/rt2800pci.c:95:2: warning: 'return' with a value, in function returning void [enabled by default]
<...>/drivers/net/wireless/rt2x00/rt2800pci.c: In function 'rt2800pci_read_eeprom':
<...>/drivers/net/wireless/rt2x00/rt2800pci.c:994:2: warning: 'retval' may be used uninitialized in this function [-Wuninitialized]

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 35143

package/mac80211/patches/605-rt2x00-pci-eeprom.patch

index 8001789..25b21ce 100644 (file)
@@ -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