Commit 771e5ce3 authored by Len Brown's avatar Len Brown

Merge branch 'thermal-regression' into release

parents 7b806016 67405439
...@@ -909,7 +909,7 @@ static int acpi_thermal_register_thermal_zone(struct acpi_thermal *tz) ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment