Changeset 35143


Ignore:
Timestamp:
2013-01-13T21:44:14+01:00 (5 years ago)
Author:
juhosg
Message:

mac80211: rt2x00: fix PCI eeprom patch

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@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/605-rt2x00-pci-eeprom.patch

    r35063 r35143  
    11--- a/drivers/net/wireless/rt2x00/rt2800pci.c 
    22+++ b/drivers/net/wireless/rt2x00/rt2800pci.c 
    3 @@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct  
     3@@ -89,7 +89,7 @@ static void rt2800pci_mcu_status(struct 
    44        rt2x00pci_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); 
    55 } 
    66  
    77-static int rt2800pci_read_eeprom_soc(struct rt2x00_dev *rt2x00dev) 
    8 +static void rt2800pci_read_eeprom_file(struct rt2x00_dev *rt2x00dev) 
     8+static int rt2800pci_read_eeprom_file(struct rt2x00_dev *rt2x00dev) 
    99 { 
    1010        memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data, EEPROM_SIZE); 
    1111        return 0; 
    12 @@ -983,8 +983,9 @@ static int rt2800pci_read_eeprom(struct  
     12@@ -983,8 +983,9 @@ static int rt2800pci_read_eeprom(struct 
    1313 { 
    1414        int retval; 
     
    1818+       if (rt2x00_is_soc(rt2x00dev) || 
    1919+           test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags)) 
    20 +               rt2800pci_read_eeprom_file(rt2x00dev); 
     20+               retval = rt2800pci_read_eeprom_file(rt2x00dev); 
    2121        else if (rt2800pci_efuse_detect(rt2x00dev)) 
    2222                retval = rt2800pci_read_eeprom_efuse(rt2x00dev); 
Note: See TracChangeset for help on using the changeset viewer.