[PATCH 5.3 165/344] leds: lm3532: Fixes for the driver for stability

[Greg Kroah-Hartman]

From: Dan Murphy <dmur...@ti.com>

[ Upstream commit 6559ac32998248182572e1ccae79dc2eb40ac7c6 ]

Fixed misspelled words, added error check during probe
on the init of the registers, and fixed ALS/I2C control
mode.

Fixes: bc1b8492c764 ("leds: lm3532: Introduce the lm3532 LED driver")
Reported-by: Pavel Machek <pa...@ucw.cz>
Signed-off-by: Dan Murphy <dmur...@ti.com>
Acked-by: Pavel Machek <pa...@ucw.cz>
Signed-off-by: Jacek Anaszewski <jacek.anaszew...@gmail.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/leds/leds-lm3532.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/leds/leds-lm3532.c b/drivers/leds/leds-lm3532.c
index 180895b83b888..e55a64847fe2f 100644
--- a/drivers/leds/leds-lm3532.c
+++ b/drivers/leds/leds-lm3532.c
@@ -40,7 +40,7 @@
 #define LM3532_REG_ZN_3_LO     0x67
 #define LM3532_REG_MAX         0x7e
 
-/* Contorl Enable */
+/* Control Enable */
 #define LM3532_CTRL_A_ENABLE   BIT(0)
 #define LM3532_CTRL_B_ENABLE   BIT(1)
 #define LM3532_CTRL_C_ENABLE   BIT(2)
@@ -302,7 +302,7 @@ static int lm3532_led_disable(struct lm3532_led *led_data)
        int ret;
 
        ret = regmap_update_bits(led_data->priv->regmap, LM3532_REG_ENABLE,
-                                        ctrl_en_val, ~ctrl_en_val);
+                                        ctrl_en_val, 0);
        if (ret) {
                dev_err(led_data->priv->dev, "Failed to set ctrl:%d\n", ret);
                return ret;
@@ -321,7 +321,7 @@ static int lm3532_brightness_set(struct led_classdev 
*led_cdev,
 
        mutex_lock(&led->priv->lock);
 
-       if (led->mode == LM3532_BL_MODE_ALS) {
+       if (led->mode == LM3532_ALS_CTRL) {
                if (brt_val > LED_OFF)
                        ret = lm3532_led_enable(led);
                else
@@ -542,11 +542,14 @@ static int lm3532_parse_node(struct lm3532_data *priv)
                }
 
                if (led->mode == LM3532_BL_MODE_ALS) {
+                       led->mode = LM3532_ALS_CTRL;
                        ret = lm3532_parse_als(priv);
                        if (ret)
                                dev_err(&priv->client->dev, "Failed to parse 
als\n");
                        else
                                lm3532_als_configure(priv, led);
+               } else {
+                       led->mode = LM3532_I2C_CTRL;
                }
 
                led->num_leds = fwnode_property_read_u32_array(child,
@@ -590,7 +593,13 @@ static int lm3532_parse_node(struct lm3532_data *priv)
                        goto child_out;
                }
 
-               lm3532_init_registers(led);
+               ret = lm3532_init_registers(led);
+               if (ret) {
+                       dev_err(&priv->client->dev, "register init err: %d\n",
+                               ret);
+                       fwnode_handle_put(child);
+                       goto child_out;
+               }
 
                i++;
        }
-- 
2.20.1