Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71f9f081 authored by Fabio Estevam's avatar Fabio Estevam Committed by Dmitry Torokhov
Browse files

Input: lpc32xx_ts - check for clk_prepare_enable() error 



clk_prepare_enable() may fail, so we better check its return value and
propagate it in the case of error.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent c2868417

drivers/input/touchscreen/lpc32xx_ts.c

+8 −5
Original line number Diff line number Diff line
@@ -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)