Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[mv-sheeva.git] / drivers / acpi / pci_root.c

diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 8a5bf3b356faa2d60c40f0c1f6aef6279d9d57c8..55b5b90c2a44288f786d266a7cc5810b215ba227 100644 (file)
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -395,7 +395,7 @@ struct pci_dev *acpi_get_pci_dev(acpi_handle handle)
                fn  = adr & 0xffff;
 
                pdev = pci_get_slot(pbus, PCI_DEVFN(dev, fn));
-               if (hnd == handle)
+               if (!pdev || hnd == handle)
                        break;
 
                pbus = pdev->subordinate;