diff options
Diffstat (limited to 'drivers/platform/x86/acerhdf.c')
-rw-r--r-- | drivers/platform/x86/acerhdf.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/platform/x86/acerhdf.c b/drivers/platform/x86/acerhdf.c index 7fe7dbf2f4ef..91b16c8a45bd 100644 --- a/drivers/platform/x86/acerhdf.c +++ b/drivers/platform/x86/acerhdf.c | |||
@@ -443,6 +443,10 @@ static int acerhdf_get_trip_type(struct thermal_zone_device *thermal, int trip, | |||
443 | { | 443 | { |
444 | if (trip == 0) | 444 | if (trip == 0) |
445 | *type = THERMAL_TRIP_ACTIVE; | 445 | *type = THERMAL_TRIP_ACTIVE; |
446 | else if (trip == 1) | ||
447 | *type = THERMAL_TRIP_CRITICAL; | ||
448 | else | ||
449 | return -EINVAL; | ||
446 | 450 | ||
447 | return 0; | 451 | return 0; |
448 | } | 452 | } |
@@ -463,6 +467,10 @@ static int acerhdf_get_trip_temp(struct thermal_zone_device *thermal, int trip, | |||
463 | { | 467 | { |
464 | if (trip == 0) | 468 | if (trip == 0) |
465 | *temp = fanon; | 469 | *temp = fanon; |
470 | else if (trip == 1) | ||
471 | *temp = ACERHDF_TEMP_CRIT; | ||
472 | else | ||
473 | return -EINVAL; | ||
466 | 474 | ||
467 | return 0; | 475 | return 0; |
468 | } | 476 | } |
@@ -713,7 +721,7 @@ static int acerhdf_register_thermal(void) | |||
713 | if (IS_ERR(cl_dev)) | 721 | if (IS_ERR(cl_dev)) |
714 | return -EINVAL; | 722 | return -EINVAL; |
715 | 723 | ||
716 | thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL, | 724 | thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL, |
717 | &acerhdf_dev_ops, | 725 | &acerhdf_dev_ops, |
718 | &acerhdf_zone_params, 0, | 726 | &acerhdf_zone_params, 0, |
719 | (kernelmode) ? interval*1000 : 0); | 727 | (kernelmode) ? interval*1000 : 0); |