Skip to contentSkip to conversation

mfd: arizona: Add missing braces

PATCH In review Charles Keepax 2 participants 2 messages May 19, 2015 – May 26, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mfd: arizona: Add missing braces

Some braces were missing from commit 67f0b1133d55 ("mfd: arizona:
Add better support for system suspend"). This will cause the error check to run even if the register write didn't happen (although ret will always be zero so it is harmless). This patch adds the missing braces.

---

Changes since v1:
- Corrected braino in commit message (parenthesis -> braces)

Thanks,
Charles

 drivers/mfd/arizona-core.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/mfd/arizona-core.c +2 -1
index 5caf579..bebf58a 100644
@@ -626,7 +626,7 @@ static int arizona_runtime_suspend(struct device *dev)
 		}
 		break;
 	case WM5102:
-		if (!(val & ARIZONA_JD1_ENA))
+		if (!(val & ARIZONA_JD1_ENA)) {
 			ret = regmap_write(arizona->regmap,
 					   ARIZONA_WRITE_SEQUENCER_CTRL_3, 0x0);
 			if (ret) {
@@ -635,6 +635,7 @@ static int arizona_runtime_suspend(struct device *dev)
 					ret);
 				return ret;
 			}
+		}
 		break;
 	default:
 		break;
Signature · 1 line
1.7.2.5
#1 lore raw
Quoted 10 lines · Charles Keepax

Some braces were missing from commit 67f0b1133d55 ("mfd: arizona:
Add better support for system suspend"). This will cause the error check to run even if the register write didn't happen (although ret will always be zero so it is harmless). This patch adds the missing braces.

---

Quoted 8 lines

Changes since v1:
- Corrected braino in commit message (parenthesis -> braces)

Thanks,
Charles

 drivers/mfd/arizona-core.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Fixed-up into the original patch.

Quoted 21 lines
drivers/mfd/arizona-core.c +2 -1
index 5caf579..bebf58a 100644
@@ -626,7 +626,7 @@ static int arizona_runtime_suspend(struct device *dev)
 		}
 		break;
 	case WM5102:
-		if (!(val & ARIZONA_JD1_ENA))
+		if (!(val & ARIZONA_JD1_ENA)) {
 			ret = regmap_write(arizona->regmap,
 					   ARIZONA_WRITE_SEQUENCER_CTRL_3, 0x0);
 			if (ret) {
@@ -635,6 +635,7 @@ static int arizona_runtime_suspend(struct device *dev)
 					ret);
 				return ret;
 			}
+		}
 		break;
 	default:
 		break;
Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog