Commit afdd3ab3 authored Jan 14, 2014 by Ben Dooks Committed by Rafael J. Wysocki Jan 15, 2014

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>

parent 8a6720ec

drivers/base/power/clock_ops.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -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,7 +263,8 @@ 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);
		ret = clk_enable(ce->clk);
		if (!ret)
		ce->status = PCE_STATUS_ENABLED;
		}
		}