diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2017-07-05 14:51:32 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2017-07-05 14:51:32 +0800 |
| commit | 467aebee872af7f5e703809e19a66de633a1aa2c (patch) | |
| tree | 21a80e16c5e7a3c1d34c60fb6f6274eb9e6c1347 /drivers/thermal/hisi_thermal.c | |
| parent | c0bc126f97fb929b3ae02c1c62322645d70eb408 (diff) | |
| parent | 1fe3854a83b580727c9464b37b62ba77ead1d6f6 (diff) | |
| download | linux-467aebee872af7f5e703809e19a66de633a1aa2c.tar.gz | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
Diffstat (limited to 'drivers/thermal/hisi_thermal.c')
| -rw-r--r-- | drivers/thermal/hisi_thermal.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index f6429666a1cf..9c3ce341eb97 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -397,8 +397,11 @@ static int hisi_thermal_suspend(struct device *dev) static int hisi_thermal_resume(struct device *dev) { struct hisi_thermal_data *data = dev_get_drvdata(dev); + int ret; - clk_prepare_enable(data->clk); + ret = clk_prepare_enable(data->clk); + if (ret) + return ret; data->irq_enabled = true; hisi_thermal_enable_bind_irq_sensor(data); |