diff options
| author | Peter Feuerer <[email protected]> | 2014-11-28 15:20:51 +0100 |
|---|---|---|
| committer | Darren Hart <[email protected]> | 2014-12-04 03:24:55 -0800 |
| commit | 7e8b6d737da9c684f02d315e312110be21fbf992 (patch) | |
| tree | 609167a666dc95c434baff497f1c463f4e5a9a9a | |
| parent | 48c8dd64345ba2a8c41556095c7adacb1c8af7c1 (diff) | |
acerhdf: added critical trip point
added critical trip point which represents the temperature limit.
Added return -EINVAL in case wrong trip point is provided.
Cc: [email protected]
Cc: Darren Hart <[email protected]>
Cc: Andrew Morton <[email protected]>
Cc: Andreas Mohr <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: Javi Merino <[email protected]>
Signed-off-by: Peter Feuerer <[email protected]>
Signed-off-by: Darren Hart <[email protected]>
| -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, { if (trip == 0) *type = THERMAL_TRIP_ACTIVE; + else if (trip == 1) + *type = THERMAL_TRIP_CRITICAL; + else + return -EINVAL; return 0; } @@ -463,6 +467,10 @@ static int acerhdf_get_trip_temp(struct thermal_zone_device *thermal, int trip, { if (trip == 0) *temp = fanon; + else if (trip == 1) + *temp = ACERHDF_TEMP_CRIT; + else + return -EINVAL; return 0; } @@ -713,7 +721,7 @@ static int acerhdf_register_thermal(void) if (IS_ERR(cl_dev)) return -EINVAL; - thz_dev = thermal_zone_device_register("acerhdf", 1, 0, NULL, + thz_dev = thermal_zone_device_register("acerhdf", 2, 0, NULL, &acerhdf_dev_ops, &acerhdf_zone_params, 0, (kernelmode) ? interval*1000 : 0); |