summaryrefslogtreecommitdiffstats
path: root/drivers/pci/probe.c
diff options
context:
space:
mode:
authorYu Zhao2009-05-27 18:25:05 +0200
committerJesse Barnes2009-06-04 12:29:43 +0200
commitf79b1b146b52765ee38bfb91bb14eb850fa98017 (patch)
tree6085fffb1442801293b8132b5d3f2aa735d0abdd /drivers/pci/probe.c
parentLinux 2.6.30-rc8 (diff)
downloadkernel-qcow2-linux-f79b1b146b52765ee38bfb91bb14eb850fa98017.tar.gz
kernel-qcow2-linux-f79b1b146b52765ee38bfb91bb14eb850fa98017.tar.xz
kernel-qcow2-linux-f79b1b146b52765ee38bfb91bb14eb850fa98017.zip
PCI: use fixed-up device class when configuring device
The device class may be changed after the fixup, so re-read the class value from pci_dev when configuring the device. Otherwise some devices such as JMicron SATA controller won't work. Reviewed-by: Matthew Wilcox <willy@linux.intel.com> Reviewed-by: Grant Grundler <grundler@parisc-linux.org> Tested-by: Marc Dionne <marc.c.dionne@gmail.com> Signed-off-by: Yu Zhao <yu.zhao@intel.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r--drivers/pci/probe.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index e3c3e081b834..f1ae2475ffff 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -745,6 +745,8 @@ int pci_setup_device(struct pci_dev *dev)
/* Early fixups, before probing the BARs */
pci_fixup_device(pci_fixup_early, dev);
+ /* device class may be changed after fixup */
+ class = dev->class >> 8;
switch (dev->hdr_type) { /* header type */
case PCI_HEADER_TYPE_NORMAL: /* standard header */