Skip to contentSkip to conversation

leds: wm8350: Complain if we fail to reenable DCDC

PATCH In review Mark Brown 2 participants 3 messages Mar 2, 2013 – Mar 6, 2013

Subsystems (2)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/1 leds: wm8350: Complain if we fail to reenable DCDC

Provide some trace, though the hardware is most likely non-functional if this happens.

---
 drivers/leds/leds-wm8350.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/leds/leds-wm8350.c +5 -1
index ed15157..86bdab3 100644
@@ -129,7 +129,11 @@ static void wm8350_led_disable(struct wm8350_led *led)
 	ret = regulator_disable(led->isink);
 	if (ret != 0) {
 		dev_err(led->cdev.dev, "Failed to disable ISINK: %d\n", ret);
-		regulator_enable(led->dcdc);
+		ret = regulator_enable(led->dcdc);
+		if (ret != 0) {
+			dev_err(led->cdev.dev, "Failed to reenable DCDC: %d\n",
+				ret);
+		}
 		return;
 	}
 
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 13 lines · Mark Brown

Provide some trace, though the hardware is most likely non-functional if this happens.

---
 drivers/leds/leds-wm8350.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/leds/leds-wm8350.c +0 -0
index ed15157..86bdab3 100644

drivers/leds/leds-wm8350.c static void wm8350_led_disable(struct wm8350_led *led) · line 133

Quoted 6 lines
drivers/leds/leds-wm8350.c +2 -1
@@ -129,7 +129,11 @@ static void wm8350_led_disable(struct wm8350_led *led)
        ret = regulator_disable(led->isink);
        if (ret != 0) {
                dev_err(led->cdev.dev, "Failed to disable ISINK: %d\n", ret);
-               regulator_enable(led->dcdc);
+               ret = regulator_enable(led->dcdc);
+               if (ret != 0) {

looks like we don't need this bracket here.

drivers/leds/leds-wm8350.c static void wm8350_led_disable(struct wm8350_led *led) · line 136

Quoted 3 lines
drivers/leds/leds-wm8350.c +3 -0
+                       dev_err(led->cdev.dev, "Failed to reenable DCDC: %d\n",
+                               ret);
+               }

ditto.

Thanks,
-Bryan

author
#2 lore raw
Quoted 7 lines · Bryan Wu

On Fri, Mar 1, 2013 at 11:40 PM, Mark Brown

drivers/leds/leds-wm8350.c static void wm8350_led_disable(struct wm8350_led *led) · line 133

Quoted 5 lines
        if (ret != 0) {
                dev_err(led->cdev.dev, "Failed to disable ISINK: %d\n", ret);
drivers/leds/leds-wm8350.c +2 -1
-               regulator_enable(led->dcdc);
+               ret = regulator_enable(led->dcdc);
+               if (ret != 0) {
Quoted 6 lines

looks like we don't need this bracket here.

drivers/leds/leds-wm8350.c static void wm8350_led_disable(struct wm8350_led *led) · line 136

Quoted 3 lines
drivers/leds/leds-wm8350.c +3 -0
+                       dev_err(led->cdev.dev, "Failed to reenable DCDC: %d\n",
+                               ret);
+               }

ditto.

It's not required but since it's inside a small but multi-line block there's the whole thing about including braces at all levels for clarity.