diff options
| author |   Ben Dooks <ben.dooks@codethink.co.uk> | 2014-01-14 12:23:41 +0000 |
|---|---|---|
| committer |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-15 01:50:50 +0100 |
| commit | afdd3ab315a4454ccb7895ddade2c20bdf91f5c6 (patch) | |
| tree | 734d326769eed47343c9a74792c11943696a1cb4 /drivers/base | |
| parent | PM / clock_ops: fix up clk prepare/unprepare count (diff) | |
| download | linux-dev-afdd3ab315a4454ccb7895ddade2c20bdf91f5c6.tar.xz linux-dev-afdd3ab315a4454ccb7895ddade2c20bdf91f5c6.zip | |
PM / clock_ops: check return of clk_enable() in pm_clk_resume()
The clk_enable() call in the pm_clk_resume() call returns an error
that is not being checked. If clk_enable() fails then we should
not set the state of the clock to PCE_STATUS_ENABLED.
Note, the issue of warning the user if this fails has not been
addressed in this patch as this is not the only place the driver
calls clk_enable().
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: Ian Molton <ian.molton@codethink.co.uk>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/clock_ops.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c index b9dd8fac87d7..cad7190465d6 100644 --- a/drivers/base/power/clock_ops.c +++ b/drivers/base/power/clock_ops.c @@ -252,6 +252,7 @@ int pm_clk_resume(struct device *dev) struct pm_subsys_data *psd = dev_to_psd(dev); struct pm_clock_entry *ce; unsigned long flags; + int ret; dev_dbg(dev, "%s()\n", __func__); @@ -262,8 +263,9 @@ int pm_clk_resume(struct device *dev) list_for_each_entry(ce, &psd->clock_list, node) { if (ce->status < PCE_STATUS_ERROR) { - clk_enable(ce->clk); - ce->status = PCE_STATUS_ENABLED; + ret = clk_enable(ce->clk); + if (!ret) + ce->status = PCE_STATUS_ENABLED; } } |