diff options
| author | Axel Lin <axel.lin@gmail.com> | 2011-07-10 09:44:09 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 14:40:01 -0400 |
| commit | 94dea7201a65816b802d8c8b8b0877590fd67d7e (patch) | |
| tree | 7eadffb57228733a76730593e57fb49fc569e507 | |
| parent | 8d537b9f6c2bef25dd3ef257be686ebb91629dd6 (diff) | |
regulator: tps65910: Add missing breaks in switch/case
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>
| -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 55dd4e6650d..425aab38981 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, | |||
| 759 | mult = (selector / VDD1_2_NUM_VOLTS) + 1; | 759 | mult = (selector / VDD1_2_NUM_VOLTS) + 1; |
| 760 | volt = VDD1_2_MIN_VOLT + | 760 | volt = VDD1_2_MIN_VOLT + |
| 761 | (selector % VDD1_2_NUM_VOLTS) * VDD1_2_OFFSET; | 761 | (selector % VDD1_2_NUM_VOLTS) * VDD1_2_OFFSET; |
| 762 | break; | ||
| 762 | case TPS65911_REG_VDDCTRL: | 763 | case TPS65911_REG_VDDCTRL: |
| 763 | volt = VDDCTRL_MIN_VOLT + (selector * VDDCTRL_OFFSET); | 764 | volt = VDDCTRL_MIN_VOLT + (selector * VDDCTRL_OFFSET); |
| 765 | break; | ||
| 766 | default: | ||
| 767 | BUG(); | ||
| 768 | return -EINVAL; | ||
| 764 | } | 769 | } |
| 765 | 770 | ||
| 766 | return volt * 100 * mult; | 771 | return volt * 100 * mult; |
| @@ -898,9 +903,11 @@ static __devinit int tps65910_probe(struct platform_device *pdev) | |||
| 898 | case TPS65910: | 903 | case TPS65910: |
| 899 | pmic->get_ctrl_reg = &tps65910_get_ctrl_register; | 904 | pmic->get_ctrl_reg = &tps65910_get_ctrl_register; |
| 900 | info = tps65910_regs; | 905 | info = tps65910_regs; |
| 906 | break; | ||
| 901 | case TPS65911: | 907 | case TPS65911: |
| 902 | pmic->get_ctrl_reg = &tps65911_get_ctrl_register; | 908 | pmic->get_ctrl_reg = &tps65911_get_ctrl_register; |
| 903 | info = tps65911_regs; | 909 | info = tps65911_regs; |
| 910 | break; | ||
| 904 | default: | 911 | default: |
| 905 | pr_err("Invalid tps chip version\n"); | 912 | pr_err("Invalid tps chip version\n"); |
| 906 | return -ENODEV; | 913 | return -ENODEV; |
