summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBibek Basu <bbasu@nvidia.com>2013-06-10 13:58:34 +0530
committerRiham Haidar <rhaidar@nvidia.com>2013-06-11 11:13:14 -0700
commita9610dbfdfd8dac35d38183349d4db1193c0425f (patch)
tree591f0cbd541ada3d5b7b71a2f1eeb6e95b77039e
parentfd51ec7b2ef6983f790f8895315494e1ef2dad28 (diff)
ARM: tegra: fix board id check
Correct the logical check for board id Bug 1220745 Change-Id: Iddfcc795772fc1f0a7ba07d59b305999afb00118 Signed-off-by: Bibek Basu <bbasu@nvidia.com> Reviewed-on: http://git-master/r/237140 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r--arch/arm/mach-tegra/board-cardhu-powermon.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu-powermon.c b/arch/arm/mach-tegra/board-cardhu-powermon.c
index 4586fc4933ff..6fed5c1a171c 100644
--- a/arch/arm/mach-tegra/board-cardhu-powermon.c
+++ b/arch/arm/mach-tegra/board-cardhu-powermon.c
@@ -1,7 +1,7 @@
/*
* arch/arm/mach-tegra/board-cardhu-powermon.c
*
- * Copyright (c) 2011-2013, NVIDIA, All Rights Reserved.
+ * Copyright (c) 2011-2013, NVIDIA CORPORATION. All Rights Reserved.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -282,7 +282,7 @@ int __init cardhu_pmon_init(void)
&power_mon_info[VDD_CORE_IN];
}
- if (bi.board_id != BOARD_PM269 || bi.board_id != BOARD_PM315) {
+ if (bi.board_id != BOARD_PM269 && bi.board_id != BOARD_PM315) {
i2c_register_board_info(0, cardhu_i2c0_ina219_board_info,
ARRAY_SIZE(cardhu_i2c0_ina219_board_info));
}