Browse Source

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: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Fabio Estevam 8 years ago
parent
commit
71f9f08103
1 changed files with 8 additions and 5 deletions
  1. 8 5
      drivers/input/touchscreen/lpc32xx_ts.c

+ 8 - 5
drivers/input/touchscreen/lpc32xx_ts.c

@@ -142,11 +142,14 @@ static void lpc32xx_stop_tsc(struct lpc32xx_tsc *tsc)
 	clk_disable_unprepare(tsc->clk);
 	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;
 	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;
 	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 */
 	/* Enable automatic ts event capture */
 	tsc_writel(tsc, LPC32XX_TSC_CON, tmp | LPC32XX_TSC_ADCCON_AUTO_EN);
 	tsc_writel(tsc, LPC32XX_TSC_CON, tmp | LPC32XX_TSC_ADCCON_AUTO_EN);
+
+	return 0;
 }
 }
 
 
 static int lpc32xx_ts_open(struct input_dev *dev)
 static int lpc32xx_ts_open(struct input_dev *dev)
 {
 {
 	struct lpc32xx_tsc *tsc = input_get_drvdata(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)
 static void lpc32xx_ts_close(struct input_dev *dev)