On Wed, Apr 12, 2017 at 08:29:23AM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@xxxxxxx>
>
> clk_prepare_enable() may fail, so we better check its return value and
> propagate it in the case of error.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxx>
Applied, thank you.
> ---
> drivers/input/touchscreen/lpc32xx_ts.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/input/touchscreen/lpc32xx_ts.c b/drivers/input/touchscreen/lpc32xx_ts.c
> index e0baa7d..4eb31ec 100644
> --- a/drivers/input/touchscreen/lpc32xx_ts.c
> +++ b/drivers/input/touchscreen/lpc32xx_ts.c
> @@ -142,11 +142,14 @@ static void lpc32xx_stop_tsc(struct lpc32xx_tsc *tsc)
> clk_disable_unprepare(tsc->clk);
> }
>
> -static void lpc32xx_setup_tsc(struct lpc32xx_tsc *tsc)
> +static int lpc32xx_setup_tsc(struct lpc32xx_tsc *tsc)
> {
> u32 tmp;
> + int err;
>
> - clk_prepare_enable(tsc->clk);
> + err = clk_prepare_enable(tsc->clk);
> + if (err)
> + return err;
>
> tmp = tsc_readl(tsc, LPC32XX_TSC_CON) & ~LPC32XX_TSC_ADCCON_POWER_UP;
>
> @@ -184,15 +187,15 @@ static void lpc32xx_setup_tsc(struct lpc32xx_tsc *tsc)
>
> /* Enable automatic ts event capture */
> tsc_writel(tsc, LPC32XX_TSC_CON, tmp | LPC32XX_TSC_ADCCON_AUTO_EN);
> +
> + return 0;
> }
>
> static int lpc32xx_ts_open(struct input_dev *dev)
> {
> struct lpc32xx_tsc *tsc = input_get_drvdata(dev);
>
> - lpc32xx_setup_tsc(tsc);
> -
> - return 0;
> + return lpc32xx_setup_tsc(tsc);
> }
>
> static void lpc32xx_ts_close(struct input_dev *dev)
> --
> 2.7.4
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
