2 files changed, 10 insertions, 3 deletions

diff --git a/drivers/power/s3c_adc_battery.c b/drivers/power/s3c_adc_battery.c
index fe16b482e912..7bc5bfe55ce9 100644
--- a/drivers/power/s3c_adc_battery.c
+++ b/drivers/power/s3c_adc_battery.c
@@ -112,6 +112,13 @@ static int calc_full_volt(int volt_val, int cur_val, int impedance)
         return volt_val + cur_val * impedance / 1000;
 }
 
+static int charge_finished(struct s3c_adc_bat *bat)
+{
+        return bat->pdata->gpio_inverted ?
+                !gpio_get_value(bat->pdata->gpio_charge_finished) :
+                gpio_get_value(bat->pdata->gpio_charge_finished);
+}
+
 static int s3c_adc_bat_get_property(struct power_supply *psy,
                                     enum power_supply_property psp,
                                     union power_supply_propval *val)
@@ -140,7 +147,7 @@ static int s3c_adc_bat_get_property(struct power_supply *psy,
 
         if (bat->cable_plugged &&
                 ((bat->pdata->gpio_charge_finished < 0) ||
-                !gpio_get_value(bat->pdata->gpio_charge_finished))) {
+                !charge_finished(bat))) {
                 lut = bat->pdata->lut_acin;
                 lut_size = bat->pdata->lut_acin_cnt;
         }
@@ -236,8 +243,7 @@ static void s3c_adc_bat_work(struct work_struct *work)
                 }
         } else {
                 if ((bat->pdata->gpio_charge_finished >= 0) && is_plugged) {
-                        is_charged = gpio_get_value(
-                                main_bat.pdata->gpio_charge_finished);
+                        is_charged = charge_finished(&main_bat);
                         if (is_charged) {
                                 if (bat->pdata->disable_charger)
                                         bat->pdata->disable_charger();
diff --git a/include/linux/s3c_adc_battery.h b/include/linux/s3c_adc_battery.h
index dbce22faa660..fbe58b7e63eb 100644
--- a/include/linux/s3c_adc_battery.h
+++ b/include/linux/s3c_adc_battery.h
@@ -14,6 +14,7 @@ struct s3c_adc_bat_pdata {
         void (*disable_charger)(void);
 
         int gpio_charge_finished;
+        int gpio_inverted;
 
         const struct s3c_adc_bat_thresh *lut_noac;
         unsigned int lut_noac_cnt;