[Xen-changelog] [linux-2.6.18-xen] Dom0 PCI: fix a regression introduced by the SR-IOV change

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1244024512 -3600
# Node ID 2e94884f0e8d0cbcc4072d11a15b4cb4e7d08707
# Parent  97e0d58411d4cee30c16ee1f81d23b72ec7f107c
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@xxxxxxxxx>
---
 drivers/pci/probe.c |    1 +
 1 files changed, 1 insertion(+)

diff -r 97e0d58411d4 -r 2e94884f0e8d drivers/pci/probe.c
--- a/drivers/pci/probe.c       Tue Jun 02 23:43:55 2009 +0100
+++ b/drivers/pci/probe.c       Wed Jun 03 11:21:52 2009 +0100
@@ -721,6 +721,7 @@ int pci_setup_device(struct pci_dev *dev
 
        /* Early fixups, before probing the BARs */
        pci_fixup_device(pci_fixup_early, dev);
+       class = dev->class >> 8;
 
        switch (dev->hdr_type) {                    /* header type */
        case PCI_HEADER_TYPE_NORMAL:                /* standard header */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog