diff options
Diffstat (limited to 'drivers/platform')
-rw-r--r-- | drivers/platform/x86/acerhdf.c | 5 | ||||
-rw-r--r-- | drivers/platform/x86/intel_mid_thermal.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index 39abb150bdd4..84c56881ba80 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c | |||
@@ -329,7 +329,8 @@ static int acerhdf_bind(struct thermal_zone_device *thermal, | |||
329 | if (cdev != cl_dev) | 329 | if (cdev != cl_dev) |
330 | return 0; | 330 | return 0; |
331 | 331 | ||
332 | if (thermal_zone_bind_cooling_device(thermal, 0, cdev)) { | 332 | if (thermal_zone_bind_cooling_device(thermal, 0, cdev, |
333 | THERMAL_NO_LIMIT, THERMAL_NO_LIMIT)) { | ||
333 | pr_err("error binding cooling dev\n"); | 334 | pr_err("error binding cooling dev\n"); |
334 | return -EINVAL; | 335 | return -EINVAL; |
335 | } | 336 | } |
@@ -661,7 +662,7 @@ static int acerhdf_register_thermal(void) | |||
661 | return -EINVAL; | 662 | return -EINVAL; |
662 | 663 | ||
663 | thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL, | 664 | thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL, |
664 | &acerhdf_dev_ops, 0, 0, 0, | 665 | &acerhdf_dev_ops, 0, |
665 | (kernelmode) ? interval*1000 : 0); | 666 | (kernelmode) ? interval*1000 : 0); |
666 | if (IS_ERR(thz_dev)) | 667 | if (IS_ERR(thz_dev)) |
667 | return -EINVAL; | 668 | return -EINVAL; |
diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c index 3a27113deda9..c8097616dd62 100644 --- a/drivers/platform/x86/intel_mid_thermal.c +++ b/drivers/platform/x86/intel_mid_thermal.c | |||
@@ -502,7 +502,7 @@ static int mid_thermal_probe(struct platform_device *pdev) | |||
502 | goto err; | 502 | goto err; |
503 | } | 503 | } |
504 | pinfo->tzd[i] = thermal_zone_device_register(name[i], | 504 | pinfo->tzd[i] = thermal_zone_device_register(name[i], |
505 | 0, 0, td_info, &tzd_ops, 0, 0, 0, 0); | 505 | 0, 0, td_info, &tzd_ops, 0, 0); |
506 | if (IS_ERR(pinfo->tzd[i])) { | 506 | if (IS_ERR(pinfo->tzd[i])) { |
507 | kfree(td_info); | 507 | kfree(td_info); |
508 | ret = PTR_ERR(pinfo->tzd[i]); | 508 | ret = PTR_ERR(pinfo->tzd[i]); |