| Message ID | 20190105195845.5453-1-pakki001@umn.edu (mailing list archive) |
|---|---|
| State | Mainlined |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | v2 pm: clk: fix a missing check of clk_prepare | expand |
On Saturday, January 5, 2019 8:58:45 PM CET Aditya Pakki wrote: > clk_prepare() could fail, so let's check its status, and if it fails, > issue an error message and change the clock_entry_status to > PCE_STATUS_ERROR > > Signed-off-by: Aditya Pakki <pakki001@umn.edu> > --- > drivers/base/power/clock_ops.c | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c > index 5a42ae4078c2..732764becafe 100644 > --- a/drivers/base/power/clock_ops.c > +++ b/drivers/base/power/clock_ops.c > @@ -65,10 +65,15 @@ static void pm_clk_acquire(struct device *dev, struct pm_clock_entry *ce) > if (IS_ERR(ce->clk)) { > ce->status = PCE_STATUS_ERROR; > } else { > - clk_prepare(ce->clk); > - ce->status = PCE_STATUS_ACQUIRED; > - dev_dbg(dev, "Clock %pC con_id %s managed by runtime PM.\n", > - ce->clk, ce->con_id); > + if (clk_prepare(ce->clk)) { > + ce->status = PCE_STATUS_ERROR; > + dev_err(dev, "clk_prepare failed\n"); > + } else { > + ce->status = PCE_STATUS_ACQUIRED; > + dev_dbg(dev, > + "Clock %pC con_id %s managed by runtime PM.\n", > + ce->clk, ce->con_id); > + } > } > } > > Applied (with some minor modifications), thanks!
diff --git a/drivers/base/power/clock_ops.c b/drivers/base/power/clock_ops.c index 5a42ae4078c2..732764becafe 100644 --- a/drivers/base/power/clock_ops.c +++ b/drivers/base/power/clock_ops.c @@ -65,10 +65,15 @@ static void pm_clk_acquire(struct device *dev, struct pm_clock_entry *ce) if (IS_ERR(ce->clk)) { ce->status = PCE_STATUS_ERROR; } else { - clk_prepare(ce->clk); - ce->status = PCE_STATUS_ACQUIRED; - dev_dbg(dev, "Clock %pC con_id %s managed by runtime PM.\n", - ce->clk, ce->con_id); + if (clk_prepare(ce->clk)) { + ce->status = PCE_STATUS_ERROR; + dev_err(dev, "clk_prepare failed\n"); + } else { + ce->status = PCE_STATUS_ACQUIRED; + dev_dbg(dev, + "Clock %pC con_id %s managed by runtime PM.\n", + ce->clk, ce->con_id); + } } }
clk_prepare() could fail, so let's check its status, and if it fails, issue an error message and change the clock_entry_status to PCE_STATUS_ERROR Signed-off-by: Aditya Pakki <pakki001@umn.edu> --- drivers/base/power/clock_ops.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)