From 81848de528102a8e838e86c43e50c1bc8165b2b0 Mon Sep 17 00:00:00 2001 From: "Zhang, Yang Z" Date: Tue, 22 May 2012 08:40:16 +0000 Subject: [PATCH] --- yaml --- r: 310928 b: refs/heads/master c: 780dbcd0eedec6528d777b668019dabb36badf1a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/xen/pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e10fceee615d..057e48cb137b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e152e6c4b0da84c66cad56597b42c4ecedb0448 +refs/heads/master: 780dbcd0eedec6528d777b668019dabb36badf1a diff --git a/trunk/drivers/xen/pci.c b/trunk/drivers/xen/pci.c index b84bf0b6cc34..18fff88254eb 100644 --- a/trunk/drivers/xen/pci.c +++ b/trunk/drivers/xen/pci.c @@ -59,7 +59,7 @@ static int xen_add_device(struct device *dev) #ifdef CONFIG_ACPI handle = DEVICE_ACPI_HANDLE(&pci_dev->dev); - if (!handle) + if (!handle && pci_dev->bus->bridge) handle = DEVICE_ACPI_HANDLE(pci_dev->bus->bridge); #ifdef CONFIG_PCI_IOV if (!handle && pci_dev->is_virtfn)