| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546 |
- --- a/drivers/net/wireless/rt2x00/rt2800pci.c
- +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
- @@ -90,7 +90,7 @@ static void rt2800pci_mcu_status(struct
- rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
- }
-
- -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);
- return 0;
- @@ -1097,8 +1097,9 @@ static int rt2800pci_read_eeprom(struct
- {
- int retval;
-
- - if (rt2x00_is_soc(rt2x00dev))
- - retval = rt2800pci_read_eeprom_soc(rt2x00dev);
- + if (rt2x00_is_soc(rt2x00dev) ||
- + test_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags))
- + retval = rt2800pci_read_eeprom_file(rt2x00dev);
- else if (rt2800pci_efuse_detect(rt2x00dev))
- retval = rt2800pci_read_eeprom_efuse(rt2x00dev);
- else
- --- a/drivers/net/wireless/rt2x00/rt2x00pci.c
- +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
- @@ -78,6 +78,7 @@ exit:
- int rt2x00pci_probe(struct pci_dev *pci_dev, const struct rt2x00_ops *ops)
- {
- struct ieee80211_hw *hw;
- + struct rt2x00_platform_data *pdata;
- struct rt2x00_dev *rt2x00dev;
- int retval;
- u16 chip;
- @@ -125,6 +126,12 @@ int rt2x00pci_probe(struct pci_dev *pci_
- rt2x00dev->irq = pci_dev->irq;
- rt2x00dev->name = pci_name(pci_dev);
-
- + /* if we get passed the name of a eeprom_file_name, then use this in
- + favour of the eeprom */
- + pdata = rt2x00dev->dev->platform_data;
- + if (pdata && pdata->eeprom_file_name)
- + set_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags);
- +
- if (pci_is_pcie(pci_dev))
- rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_PCIE);
- else
|
