diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-07-10 15:44:09 +0200 |
|---|---|---|
| committer | Liam Girdwood <lrg@slimlogic.co.uk> | 2011-07-22 12:39:13 +0200 |
| commit | d04156bca629740a661fd0738cd69ba1f08b2b20 (patch) | |
| tree | fda00dde9fbcbb6e5e092fc813e75b8f8a74e51a | |
| parent | regulator: tps65910: Fix a memory leak in tps65910_probe error path (diff) | |
| download | linux-d04156bca629740a661fd0738cd69ba1f08b2b20.tar.xz linux-d04156bca629740a661fd0738cd69ba1f08b2b20.zip | |
regulator: tps65910: Add missing breaks in switch/case
Also add a default case in tps65910_list_voltage_dcdc to silence
'volt' may be used uninitialized in this function warning.
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
| -rw-r--r-- | drivers/regulator/tps65910-regulator.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index b07a66471fb7..8e0edab74786 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c @@ -759,8 +759,13 @@ static int tps65910_list_voltage_dcdc(struct regulator_dev *dev, mult = (selector / VDD1_2_NUM_VOLTS) + 1; volt = VDD1_2_MIN_VOLT + (selector % VDD1_2_NUM_VOLTS) * VDD1_2_OFFSET; + break; case TPS65911_REG_VDDCTRL: volt = VDDCTRL_MIN_VOLT + (selector * VDDCTRL_OFFSET); + break; + default: + BUG(); + return -EINVAL; } return volt * 100 * mult; @@ -898,9 +903,11 @@ static __devinit int tps65910_probe(struct platform_device *pdev) case TPS65910: pmic->get_ctrl_reg = &tps65910_get_ctrl_register; info = tps65910_regs; + break; case TPS65911: pmic->get_ctrl_reg = &tps65911_get_ctrl_register; info = tps65911_regs; + break; default: pr_err("Invalid tps chip version\n"); kfree(pmic); |