Merge branch 'thermal-regression' into release

This commit is contained in:
Len Brown 2009-04-24 01:34:45 -04:00
commit 771e5ce3bd

View File

@ -909,7 +909,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz)
thermal_zone_device_register("acpitz", trips, tz, thermal_zone_device_register("acpitz", trips, tz,
&acpi_thermal_zone_ops, &acpi_thermal_zone_ops,
0, 0, 0, 0, 0, 0,
tz->polling_frequency); tz->polling_frequency*100);
if (IS_ERR(tz->thermal_zone)) if (IS_ERR(tz->thermal_zone))
return -ENODEV; return -ENODEV;