| Message ID | 20200905124942.GC183976@mwanda |
|---|---|
| State | Accepted |
| Commit | 30df23c5ecdfb8da5b0bc17ceef67eff9e1b0957 |
| Headers | show |
| Series | Input: imx6ul_tsc - clean up some errors in imx6ul_tsc_resume() | expand |
On Sat, Sep 05, 2020 at 03:49:42PM +0300, Dan Carpenter wrote: > If imx6ul_tsc_init() fails then we need to clean up the clocks. > > I reversed the "if (input_dev->users) {" condition to make the code a > bit simpler. > > Fixes: 6cc527b05847 ("Input: imx6ul_tsc - propagate the errors") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied, thank you. There is also an opportunity to factor out some common code from open/close and suspend/resume, I'll send out a patch in a moment. Thanks.
diff --git a/drivers/input/touchscreen/imx6ul_tsc.c b/drivers/input/touchscreen/imx6ul_tsc.c index 9ed258854349..5e6ba5c4eca2 100644 --- a/drivers/input/touchscreen/imx6ul_tsc.c +++ b/drivers/input/touchscreen/imx6ul_tsc.c @@ -530,20 +530,25 @@ static int __maybe_unused imx6ul_tsc_resume(struct device *dev) mutex_lock(&input_dev->mutex); - if (input_dev->users) { - retval = clk_prepare_enable(tsc->adc_clk); - if (retval) - goto out; - - retval = clk_prepare_enable(tsc->tsc_clk); - if (retval) { - clk_disable_unprepare(tsc->adc_clk); - goto out; - } + if (!input_dev->users) + goto out; - retval = imx6ul_tsc_init(tsc); + retval = clk_prepare_enable(tsc->adc_clk); + if (retval) + goto out; + + retval = clk_prepare_enable(tsc->tsc_clk); + if (retval) { + clk_disable_unprepare(tsc->adc_clk); + goto out; } + retval = imx6ul_tsc_init(tsc); + if (retval) { + clk_disable_unprepare(tsc->tsc_clk); + clk_disable_unprepare(tsc->adc_clk); + goto out; + } out: mutex_unlock(&input_dev->mutex); return retval;
If imx6ul_tsc_init() fails then we need to clean up the clocks. I reversed the "if (input_dev->users) {" condition to make the code a bit simpler. Fixes: 6cc527b05847 ("Input: imx6ul_tsc - propagate the errors") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/input/touchscreen/imx6ul_tsc.c | 27 +++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)