diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2016-08-08 10:59:35 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2016-08-08 10:59:35 +0800 |
| commit | 1577ddfac75ff9690ebd0d210bc7f1345c9d29ef (patch) | |
| tree | af9d348ccc26df846c7c69e62624465f42205745 /drivers/thermal/step_wise.c | |
| parent | 70c50ee72eebb3d1e3aae7450269fd8d8074c610 (diff) | |
| parent | 165989a5b667b90589f21c8affe496ad21f08591 (diff) | |
| download | linux-1577ddfac75ff9690ebd0d210bc7f1345c9d29ef.tar.gz linux-1577ddfac75ff9690ebd0d210bc7f1345c9d29ef.tar.bz2 linux-1577ddfac75ff9690ebd0d210bc7f1345c9d29ef.zip | |
Merge branches 'thermal-intel' and 'thermal-core' into next
Diffstat (limited to 'drivers/thermal/step_wise.c')
| -rw-r--r-- | drivers/thermal/step_wise.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c index ea9366ad3e6b..bcef2e7c4ec9 100644 --- a/drivers/thermal/step_wise.c +++ b/drivers/thermal/step_wise.c @@ -175,7 +175,9 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip) update_passive_instance(tz, trip_type, -1); instance->initialized = true; + mutex_lock(&instance->cdev->lock); instance->cdev->updated = false; /* cdev needs update */ + mutex_unlock(&instance->cdev->lock); } mutex_unlock(&tz->lock); |