diff options
| author | Takashi Iwai <tiwai@suse.de> | 2016-09-11 10:33:12 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2016-09-11 10:33:12 +0300 |
| commit | 3d2f4d0c0d4f3b676ecca504a3916b8e9843a181 (patch) | |
| tree | f72e05df59734bb1deeba510283072e16c056640 /drivers/thermal/clock_cooling.c | |
| parent | 09da111aef57c022ac28bb8974f41c1729102d11 (diff) | |
| parent | 3f640970a41429f0a076c01270bbd014c9eae61c (diff) | |
| download | linux-3d2f4d0c0d4f3b676ecca504a3916b8e9843a181.tar.xz | |
Merge branch 'for-linus' into for-next
Back-merge from for-linus just to make the further development easier.
Diffstat (limited to 'drivers/thermal/clock_cooling.c')
| -rw-r--r-- | drivers/thermal/clock_cooling.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/thermal/clock_cooling.c b/drivers/thermal/clock_cooling.c index 1b4ff0f4c716..ed5dd0e88657 100644 --- a/drivers/thermal/clock_cooling.c +++ b/drivers/thermal/clock_cooling.c @@ -426,6 +426,7 @@ clock_cooling_register(struct device *dev, const char *clock_name) if (!ccdev) return ERR_PTR(-ENOMEM); + mutex_init(&ccdev->lock); ccdev->dev = dev; ccdev->clk = devm_clk_get(dev, clock_name); if (IS_ERR(ccdev->clk)) |