git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[sfrench/cifs-2.6.git]
/
drivers
/
thermal
/
tegra
/
tegra30-tsensor.c
diff --git
a/drivers/thermal/tegra/tegra30-tsensor.c
b/drivers/thermal/tegra/tegra30-tsensor.c
index 9b6b693cbcf8506815d082a7957be729c7df97da..05886684f4295674df0eb3665773ee5e15a2707c 100644
(file)
--- a/
drivers/thermal/tegra/tegra30-tsensor.c
+++ b/
drivers/thermal/tegra/tegra30-tsensor.c
@@
-316,7
+316,7
@@
static void tegra_tsensor_get_hw_channel_trips(struct thermal_zone_device *tzd,
*hot_trip = 85000;
*crit_trip = 90000;
- for (i = 0; i < tzd->trips; i++) {
+ for (i = 0; i < tzd->
num_
trips; i++) {
enum thermal_trip_type type;
int trip_temp;