summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-10-12 12:51:22 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-10-12 14:42:09 +0100
commitcf6f3bf7e587a00217d7509b440f694711c76b2e (patch)
tree0a7f166bcaca397981e89e13e68d54440d1214e5
parent00010268842bda320d43159324651c330e1e8136 (diff)
downloadkernel-common-cf6f3bf7e587a00217d7509b440f694711c76b2e.tar.gz
kernel-common-cf6f3bf7e587a00217d7509b440f694711c76b2e.tar.bz2
kernel-common-cf6f3bf7e587a00217d7509b440f694711c76b2e.zip
Run pci_apply_final_quirks() sooner.
Having this as a device_initcall() means that some real device drivers can actually initialise _before_ the quirks are run, which is wrong. We want it to run _before_ device_initcall(), but _after_ fs_initcall(), since some arch-specific PCI initialisation like pcibios_assign_resources() is done at fs_initcall(). We could use rootfs_initcall() but I actually want to use that for the IOMMU initialisation, which has to come after the quirks, but still before the real devices. So use fs_initcall_sync() instead -- since this is entirely synchronous, it doesn't hurt that it'll escape the synchronisation. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/pci/quirks.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 77bf620ba218..4e1b1b81f370 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2584,7 +2584,7 @@ static int __init pci_apply_final_quirks(void)
return 0;
}
-device_initcall(pci_apply_final_quirks);
+fs_initcall_sync(pci_apply_final_quirks);
#else
void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev) {}
#endif