diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-10-12 07:51:22 -0400 | 
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-10-12 09:42:09 -0400 | 
| commit | cf6f3bf7e587a00217d7509b440f694711c76b2e (patch) | |
| tree | 0a7f166bcaca397981e89e13e68d54440d1214e5 | |
| parent | 00010268842bda320d43159324651c330e1e8136 (diff) | |
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.c | 2 | 
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) | |||
| 2584 | return 0; | 2584 | return 0; | 
| 2585 | } | 2585 | } | 
| 2586 | 2586 | ||
| 2587 | device_initcall(pci_apply_final_quirks); | 2587 | fs_initcall_sync(pci_apply_final_quirks); | 
| 2588 | #else | 2588 | #else | 
| 2589 | void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev) {} | 2589 | void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev) {} | 
| 2590 | #endif | 2590 | #endif | 
