Input: lpc32xx_ts - check for clk_prepare_enable() error
authorFabio Estevam <fabio.estevam@nxp.com>
Wed, 12 Apr 2017 15:34:03 +0000 (08:34 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Wed, 12 Apr 2017 15:47:18 +0000 (08:47 -0700)
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>
drivers/input/touchscreen/lpc32xx_ts.c

index e0baa7de410215cf56c32f7235ec1fa045ed525b..4eb31ec10b18a07107db35cdc37560e92e1cc232 100644 (file)
@@ -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)