Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mac80211: rt2x00: fix PCI eeprom patch

Browse source 
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
This commit is contained in:
Gabor Juhos 2013-01-13 20:44:14 +00:00
parent 9173312542
commit 7695c8b049
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
package/mac80211/patches/605-rt2x00-pci-eeprom.patch
View file

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