commit a9610dbfdfd8dac35d38183349d4db1193c0425f
author Bibek Basu <bbasu@nvidia.com> Mon Jun 10 13:58:34 2013 +0530
committer Riham Haidar <rhaidar@nvidia.com> Tue Jun 11 11:13:14 2013 -0700
tree 591f0cbd541ada3d5b7b71a2f1eeb6e95b77039e
parent fd51ec7b2ef6983f790f8895315494e1ef2dad28

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>

arch/arm/mach-tegra/board-cardhu-powermon.c

diff --git a/arch/arm/mach-tegra/board-cardhu-powermon.c b/arch/arm/mach-tegra/board-cardhu-powermon.c
index 4586fc4..6fed5c1 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 @@
 			&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));
 	}