Input: imx6ul_tsc - clean up some errors in imx6ul_tsc_resume() (30df23c5) · Commits · 戴 / test

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: ("Input: imx6ul_tsc - propagate the errors") Signed-off-by:

Dan Carpenter <dan.carpenter@oracle.com> Link: https://lore.kernel.org/r/20200905124942.GC183976@mwanda Signed-off-by:

Dmitry Torokhov <dmitry.torokhov@gmail.com>

drivers/input/touchscreen/imx6ul_tsc.c

+16 −11

Original line number	Diff line number	Diff line
		@@ -530,7 +530,9 @@ static int __maybe_unused imx6ul_tsc_resume(struct device *dev)

		mutex_lock(&input_dev->mutex);

		if (input_dev->users) {
		if (!input_dev->users)
		goto out;

		retval = clk_prepare_enable(tsc->adc_clk);
		if (retval)
		goto out;
		@@ -542,8 +544,11 @@ static int __maybe_unused imx6ul_tsc_resume(struct device *dev)
		}

		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;

Admin message