Merge branches 'pci/enumeration', 'pci/virtualization' and 'pci/cleanup' into next

[uclinux-h8/linux.git] / drivers / pci / hotplug / acpi_pcihp.c

diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index 2ac9a28..876ccc6 100644 (file)
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -182,7 +182,8 @@ int acpi_pci_check_ejectable(struct pci_bus *pbus, acpi_handle handle)
 {
        acpi_handle bridge_handle, parent_handle;
 
-       if (!(bridge_handle = acpi_pci_get_bridge_handle(pbus)))
+       bridge_handle = acpi_pci_get_bridge_handle(pbus);
+       if (!bridge_handle)
                return 0;
        if ((ACPI_FAILURE(acpi_get_parent(handle, &parent_handle))))
                return 0;