Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / drivers / power / sbs-battery.c

diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c
index d6226d6..768b9fc 100644 (file)
--- a/drivers/power/sbs-battery.c
+++ b/drivers/power/sbs-battery.c
@@ -382,8 +382,6 @@ static int sbs_get_battery_property(struct i2c_client *client,
 
                if (ret & BATTERY_FULL_CHARGED)
                        val->intval = POWER_SUPPLY_STATUS_FULL;
-               else if (ret & BATTERY_FULL_DISCHARGED)
-                       val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
                else if (ret & BATTERY_DISCHARGING)
                        val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
                else
@@ -702,8 +700,6 @@ static void sbs_delayed_work(struct work_struct *work)
 
        if (ret & BATTERY_FULL_CHARGED)
                ret = POWER_SUPPLY_STATUS_FULL;
-       else if (ret & BATTERY_FULL_DISCHARGED)
-               ret = POWER_SUPPLY_STATUS_NOT_CHARGING;
        else if (ret & BATTERY_DISCHARGING)
                ret = POWER_SUPPLY_STATUS_DISCHARGING;
        else