diff options
| author | Ajay Gupta <ajayg@nvidia.com> | 2013-04-10 15:15:49 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:09:28 -0700 |
| commit | 917ffc396a1b518d343740356ec45a1b5164e440 (patch) | |
| tree | 70241ea7a1e9c207be6e6b1c6efa7f3ec3a99908 | |
| parent | b6e0ea5474618bc50239545f14655dc4964037ff (diff) | |
ARM: tegra: dalmore: Fix logical vs bitwise AND bug
Fixes bug be correctly using bitwise '&' AND operation
Change-Id: I3dbc6a5f91cbafbe93203bd84d8b989a419e307e
Signed-off-by: Ajay Gupta <ajayg@nvidia.com>
Reviewed-on: http://git-master/r/218396
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-by: Ashutosh Jha <ajha@nvidia.com>
(cherry picked from commit 670d49e44b77376954ed530eb47cb7231afdf58e)
Reviewed-on: http://git-master/r/222117
Reviewed-by: Automatic_Commit_Validation_User
| -rw-r--r-- | arch/arm/mach-tegra/board-dalmore-power.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-dalmore-power.c b/arch/arm/mach-tegra/board-dalmore-power.c index ae023bab7a98..eaf7ac980ba8 100644 --- a/arch/arm/mach-tegra/board-dalmore-power.c +++ b/arch/arm/mach-tegra/board-dalmore-power.c @@ -1037,7 +1037,7 @@ int __init dalmore_palmas_regulator_init(void) writel(pmc_ctrl | PMC_CTRL_INTR_LOW, pmc + PMC_CTRL); power_config = get_power_config(); - if (power_config && POWER_CONFIG2) + if (power_config & POWER_CONFIG2) set_dalmore_power_config2(); for (i = 0; i < PALMAS_NUM_REGS ; i++) { @@ -1203,7 +1203,7 @@ static int __init dalmore_fixed_regulator_init(void) power_config = get_power_config(); tegra_get_board_info(&board_info); - if (power_config && POWER_CONFIG2) + if (power_config & POWER_CONFIG2) platform_add_devices(fixed_reg_devs_dalmore_config2, ARRAY_SIZE(fixed_reg_devs_dalmore_config2)); |