]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
drivers/video/backlight/l4f00242t03.c: check return value of regulator_enable()
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 23:17:34 +0000 (16:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 30 Apr 2013 01:28:15 +0000 (18:28 -0700)
regulator_enable() is marked as as __must_check.  Therefore the return
value of regulator_enable() should be checked.  Also, this patch checks
return value of regulator_set_voltage().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/video/backlight/l4f00242t03.c

index fb61557713266ee0abd2ec616b7f177e789b88d5..a35a38c709cf03753a717c8be86d14aae982bcc6 100644 (file)
@@ -51,14 +51,33 @@ static void l4f00242t03_lcd_init(struct spi_device *spi)
        struct l4f00242t03_pdata *pdata = spi->dev.platform_data;
        struct l4f00242t03_priv *priv = spi_get_drvdata(spi);
        const u16 cmd[] = { 0x36, param(0), 0x3A, param(0x60) };
+       int ret;
 
        dev_dbg(&spi->dev, "initializing LCD\n");
 
-       regulator_set_voltage(priv->io_reg, 1800000, 1800000);
-       regulator_enable(priv->io_reg);
+       ret = regulator_set_voltage(priv->io_reg, 1800000, 1800000);
+       if (ret) {
+               dev_err(&spi->dev, "failed to set the IO regulator voltage.\n");
+               return;
+       }
+       ret = regulator_enable(priv->io_reg);
+       if (ret) {
+               dev_err(&spi->dev, "failed to enable the IO regulator.\n");
+               return;
+       }
 
-       regulator_set_voltage(priv->core_reg, 2800000, 2800000);
-       regulator_enable(priv->core_reg);
+       ret = regulator_set_voltage(priv->core_reg, 2800000, 2800000);
+       if (ret) {
+               dev_err(&spi->dev, "failed to set the core regulator voltage.\n");
+               regulator_disable(priv->io_reg);
+               return;
+       }
+       ret = regulator_enable(priv->core_reg);
+       if (ret) {
+               dev_err(&spi->dev, "failed to enable the core regulator.\n");
+               regulator_disable(priv->io_reg);
+               return;
+       }
 
        l4f00242t03_reset(pdata->reset_gpio);