aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorThomas Renninger <trenn@suse.de>2005-10-03 10:39:00 -0700
committerLen Brown <len.brown@intel.com>2005-11-30 04:35:02 -0500
commitbd7ce5b5ff930c29b1c0405051e9c9388660b785 (patch)
tree7aa081cec117678fd4175b02674fd2f7e3f114db /drivers/acpi
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge (diff)
downloadlinux-dev-bd7ce5b5ff930c29b1c0405051e9c9388660b785.tar.xz
linux-dev-bd7ce5b5ff930c29b1c0405051e9c9388660b785.zip
[ACPI] fix HP nx8220 boot hang regression
This patch reverts the acpi_bus_find_driver() return value check that came in via the PCI tree via 3fb02738b0fd36f47710a2bf207129efd2f5daa2 [PATCH] acpi bridge hotadd: Allow ACPI .add and .start operations to be done independently This particular change broke booting of some HP/Compaq laptops unless acpi=noirq is used. http://bugzilla.kernel.org/show_bug.cgi?id=5221 https://bugzilla.novell.com/show_bug.cgi?id=116763 Signed-off-by: Thomas Renninger <trenn@suse.de> Cc: Rajesh Shah <rajesh.shah@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 23e2c6968a11..31218e1d2a18 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1110,7 +1110,7 @@ acpi_add_single_object(struct acpi_device **child,
*
* TBD: Assumes LDM provides driver hot-plug capability.
*/
- result = acpi_bus_find_driver(device);
+ acpi_bus_find_driver(device);
end:
if (!result)