From d920af06c82b2ed795e29bbf5b01ab2872bebcb0 Mon Sep 17 00:00:00 2001
From: prototype74 <46874884+prototype74@users.noreply.github.com>
Date: Sun, 15 Nov 2020 23:54:16 +0100
Subject: [PATCH] fixup! s3ve3g: improved sec-battery compatibility with
 additional fixes

    * fix usage of logical AND operator

Change-Id: Idbceca2e123ac12af7f147094b072b5511524a48
---
 drivers/power/qpnp-charger.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/power/qpnp-charger.c b/drivers/power/qpnp-charger.c
index c597b105ac4..cb73bfa07a8 100644
--- a/drivers/power/qpnp-charger.c
+++ b/drivers/power/qpnp-charger.c
@@ -1639,7 +1639,7 @@ qpnp_chg_set_appropriate_vddmax(struct qpnp_chg_chip *chip)
 				chip->delta_vddmax_mv);
 }
 
-#if !defined(CONFIG_SEC_ATLANTIC_PROJECT) || !defined(CONFIG_MACH_S3VE3G_EUR)
+#if !defined(CONFIG_SEC_ATLANTIC_PROJECT) && !defined(CONFIG_MACH_S3VE3G_EUR)
 #define MIN_DELTA_MV_TO_INCREASE_VDD_MAX	8
 #define MAX_DELTA_VDD_MAX_MV			80
 #define VDD_MAX_CENTER_OFFSET			4
@@ -4669,7 +4669,7 @@ qpnp_chg_setup_flags(struct qpnp_chg_chip *chip)
 	return 0;
 }
 
-#if !defined(CONFIG_SEC_ATLANTIC_PROJECT) || !defined(CONFIG_MACH_S3VE3G_EUR)
+#if !defined(CONFIG_SEC_ATLANTIC_PROJECT) && !defined(CONFIG_MACH_S3VE3G_EUR)
 static void
 sec_qpnp_chg_check_vddmax(struct qpnp_chg_chip *chip)
 {
@@ -5612,7 +5612,7 @@ sec_qpnp_chg_get_property(struct power_supply *psy,
 				val->intval = POWER_SUPPLY_HEALTH_GOOD;
 			break;
 		case POWER_SUPPLY_PROP_CURRENT_MAX:
-#if !defined(CONFIG_SEC_ATLANTIC_PROJECT) || !defined(CONFIG_MACH_S3VE3G_EUR)
+#if !defined(CONFIG_SEC_ATLANTIC_PROJECT) && !defined(CONFIG_MACH_S3VE3G_EUR)
 			sec_qpnp_chg_check_vddmax(chip);
 #endif
 			val->intval = charger->charging_current_max;