Commit bb070e43 authored Apr 08, 2008 by Krzysztof Helt Committed by Linus Torvalds Apr 08, 2008

acpi thermal: fix result check



thermal_zone_device_register() uses the ERR_PTR macro on its return values.  A
correct check is to use the IS_ERR() macro.

The 2.6.25 kernels panic on Compaq AP550 without this patch as it has more
then 10 (THERMAL_MAX_TRIPS) trip points (there are 12).

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Len Brown <lenb@kernel.org>
Acked-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ef45cb62

drivers/acpi/thermal.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1125,7 +1125,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
		tz->trips.active[i].flags.valid; i++, trips++);
		tz->thermal_zone = thermal_zone_device_register("ACPI thermal zone",
		trips, tz, &acpi_thermal_zone_ops);
		if (!tz->thermal_zone)
		if (IS_ERR(tz->thermal_zone))
		return -ENODEV;

		result = sysfs_create_link(&tz->device->dev.kobj,

Admin message