projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[cascardo/linux.git]
/
drivers
/
thermal
/
ti-soc-thermal
/
ti-thermal-common.c
diff --git
a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c
index
4f8b9af
..
5a47cc8
100644
(file)
--- a/
drivers/thermal/ti-soc-thermal/ti-thermal-common.c
+++ b/
drivers/thermal/ti-soc-thermal/ti-thermal-common.c
@@
-110,6
+110,7
@@
static inline int ti_thermal_get_temp(struct thermal_zone_device *thermal,
} else {
dev_err(bgp->dev,
"Failed to read PCB state. Using defaults\n");
+ ret = 0;
}
}
*temp = ti_thermal_hotspot_temperature(tmp, slope, constant);