1 Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c
2 ===================================================================
3 --- linux-3.10.34.orig/arch/mips/lantiq/xway/ath_eep.c 2014-03-29 20:17:33.826386600 +0000
4 +++ linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c 2014-03-29 20:18:19.610387315 +0000
9 +static int ath9k_eep_load;
10 int __init of_ath9k_eeprom_probe(struct platform_device *pdev)
12 struct device_node *np = pdev->dev.of_node, *mtd_np;
14 if (!of_property_read_u32(np, "ath,pci-slot", &pci_slot)) {
15 ltq_pci_ath_fixup(pci_slot, ath9k_pdata.eeprom_data);
16 dev_info(&pdev->dev, "pci slot: %u\n", pci_slot);
17 + if (ath9k_eep_load) {
18 + struct pci_dev *d = NULL;
19 + while ((d = pci_get_device(PCI_VENDOR_ID_ATHEROS,
20 + PCI_ANY_ID, d)) != NULL)
21 + pci_fixup_device(pci_fixup_early, d);
25 dev_info(&pdev->dev, "loaded ath9k eeprom\n");
30 -static int ath9k_eep_loaded;
31 static int __init of_ath9k_eeprom_init(void)
33 int ret = platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe);
36 - ath9k_eep_loaded = 1;
43 static int __init of_ath9k_eeprom_init_late(void)
45 - if (ath9k_eep_loaded)
46 + if (!ath9k_eep_load)
48 return platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe);
52 return platform_driver_probe(&ath5k_eeprom_driver, of_ath5k_eeprom_probe);
54 -device_initcall(of_ath5k_eeprom_init);
55 +subsys_initcall(of_ath5k_eeprom_init);