PMIC: MAX77686: fix invalid bus check

PATCH New Jeroen Hofstee 2 participants 2 messages Jun 18, 2014 – Jun 23, 2014

Share & tools

Jeroen Hofstee

author

2014-06-18 20:13 UTC #0 lore raw

PATCH 1/1 PMIC: MAX77686: fix invalid bus check

Since p->bus is unsigned checking for negative values is optimized away. Since bus is already used as an argument use tmp. While at it, don't declare variables in the middle of a function.

cc Rajeshwari Shinde <[email protected]>

Signed-off-by Jeroen Hofstee <[email protected]>

---
 drivers/power/pmic/pmic_max77686.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

drivers/power/pmic/pmic_max77686.c +8 -5

index d4c430e..df1fd91 100644
@@ -210,6 +210,10 @@ int pmic_init(unsigned char bus)
 {
 	static const char name[] = "MAX77686_PMIC";
 	struct pmic *p = pmic_alloc();
+#ifdef CONFIG_OF_CONTROL
+	const void *blob = gd->fdt_blob;
+	int node, parent, tmp;
+#endif
 
 	if (!p) {
 		printf("%s: POWER allocation error!\n", __func__);

@@ -217,9 +221,6 @@ int pmic_init(unsigned char bus)
 	}
 
 #ifdef CONFIG_OF_CONTROL
-	const void *blob = gd->fdt_blob;
-	int node, parent;
-
 	node = fdtdec_next_compatible(blob, 0, COMPAT_MAXIM_MAX77686_PMIC);
 	if (node < 0) {
 		debug("PMIC: No node for PMIC Chip in device tree\n");

@@ -233,11 +234,13 @@ int pmic_init(unsigned char bus)
 		return -1;
 	}
 
-	p->bus = i2c_get_bus_num_fdt(parent);
-	if (p->bus < 0) {
+	/* tmp since p->bus is unsigned */
+	tmp = i2c_get_bus_num_fdt(parent);
+	if (tmp < 0) {
 		debug("%s: Cannot find I2C bus\n", __func__);
 		return -1;
 	}
+	p->bus = tmp;
 	p->hw.i2c.addr = fdtdec_get_int(blob, node, "reg", 9);
 #else
 	p->bus = bus;

Signature · 1 line

1.8.3.2

Minkyu Kang

2014-06-23 08:43 UTC #1 lore raw

PATCH 1/1 PMIC: MAX77686: fix invalid bus check

Quoted 11 lines · Jeroen Hofstee

Since p->bus is unsigned checking for negative values is optimized away. Since bus is already used as an argument use tmp. While at it, don't declare variables in the middle of a function.
cc Rajeshwari Shinde <[email protected]>
Signed-off-by Jeroen Hofstee <[email protected]>
---
 drivers/power/pmic/pmic_max77686.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

applied to u-boot-samsung.

Thanks,
Minkyu Kang.