Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 310928
b: refs/heads/master
c: 780dbcd
h: refs/heads/master
v: v3
  • Loading branch information
Zhang, Yang Z authored and Konrad Rzeszutek Wilk committed May 30, 2012
1 parent 81c1949 commit 81848de
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5e152e6c4b0da84c66cad56597b42c4ecedb0448
refs/heads/master: 780dbcd0eedec6528d777b668019dabb36badf1a
2 changes: 1 addition & 1 deletion trunk/drivers/xen/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 81848de

Please sign in to comment.