diff options
| author | Jeroen Hofstee <jeroen@myspectrum.nl> | 2014-06-18 22:13:52 +0200 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2014-06-23 10:04:13 +0900 |
| commit | 00d4796c555b95e986b4a01a9322d49f64c1349f (patch) | |
| tree | d867afd85c7e3da13d89a2453518c43a2ec742ff /drivers | |
| parent | 0cf7e18904f245d0ba7a5ed85ed48bea386258d4 (diff) | |
| download | talos-obmc-uboot-00d4796c555b95e986b4a01a9322d49f64c1349f.tar.gz talos-obmc-uboot-00d4796c555b95e986b4a01a9322d49f64c1349f.zip | |
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 <rajeshwari.s@samsung.com>
Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/power/pmic/pmic_max77686.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/power/pmic/pmic_max77686.c b/drivers/power/pmic/pmic_max77686.c index d4c430e22e..df1fd91de3 100644 --- a/drivers/power/pmic/pmic_max77686.c +++ b/drivers/power/pmic/pmic_max77686.c @@ -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; |
