ia64/linux-2.6.18-xen.hg

changeset 890:2e94884f0e8d

Dom0 PCI: fix a regression introduced by the SR-IOV change

The device class may be changed during the early fixup. So need to
re-read the device class from pci_dev after the fixup.

The patch "PCI: centralize device setup code" (c/s 825) wrongly
cleaned up the device class re-read. This patch reverts that change.

Signed-off-by: Yu Zhao <yu.zhao@intel.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Jun 03 11:21:52 2009 +0100 (2009-06-03)
parents 97e0d58411d4
children 104b6ae6b257
files drivers/pci/probe.c
line diff
     1.1 --- a/drivers/pci/probe.c	Tue Jun 02 23:43:55 2009 +0100
     1.2 +++ b/drivers/pci/probe.c	Wed Jun 03 11:21:52 2009 +0100
     1.3 @@ -721,6 +721,7 @@ int pci_setup_device(struct pci_dev *dev
     1.4  
     1.5  	/* Early fixups, before probing the BARs */
     1.6  	pci_fixup_device(pci_fixup_early, dev);
     1.7 +	class = dev->class >> 8;
     1.8  
     1.9  	switch (dev->hdr_type) {		    /* header type */
    1.10  	case PCI_HEADER_TYPE_NORMAL:		    /* standard header */