]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
regulator: tps65910: Add missing breaks in switch/case
authorAxel Lin <axel.lin@gmail.com>
Sun, 10 Jul 2011 13:44:09 +0000 (21:44 +0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 3 Oct 2011 18:40:01 +0000 (11:40 -0700)
commit d04156bca629740a661fd0738cd69ba1f08b2b20 upstream.

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>
Cc: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/regulator/tps65910-regulator.c

index 55dd4e6650db80caa02d42a61f7315b90473b809..425aab38981e5fbad9cf4082d67809ff12175bb5 100644 (file)
@@ -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");
                return -ENODEV;