projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'overflow-v4.18-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
drivers
/
thermal
/
int340x_thermal
/
int340x_thermal_zone.c
diff --git
a/drivers/thermal/int340x_thermal/int340x_thermal_zone.c
b/drivers/thermal/int340x_thermal/int340x_thermal_zone.c
index
953c839
..
9ec27ac
100644
(file)
--- a/
drivers/thermal/int340x_thermal/int340x_thermal_zone.c
+++ b/
drivers/thermal/int340x_thermal/int340x_thermal_zone.c
@@
-147,9
+147,9
@@
static int int340x_thermal_get_trip_hyst(struct thermal_zone_device *zone,
status = acpi_evaluate_integer(d->adev->handle, "GTSH", NULL, &hyst);
if (ACPI_FAILURE(status))
-
return -EIO
;
-
- *temp = hyst * 100;
+
*temp = 0
;
+ else
+
*temp = hyst * 100;
return 0;
}