Merge branch 'stable-3.2' into pandora-3.2

[pandora-kernel.git] / drivers / power / power_supply_leds.c

diff --git a/drivers/power/power_supply_leds.c b/drivers/power/power_supply_leds.c
index da25eb9..84c1d96 100644 (file)
--- a/drivers/power/power_supply_leds.c
+++ b/drivers/power/power_supply_leds.c
@@ -21,6 +21,7 @@
 static void power_supply_update_bat_leds(struct power_supply *psy)
 {
        union power_supply_propval status;
+       union power_supply_propval current_now;
        unsigned long delay_on = 0;
        unsigned long delay_off = 0;
 
@@ -31,8 +32,11 @@ static void power_supply_update_bat_leds(struct power_supply *psy)
 
        switch (status.intval) {
        case POWER_SUPPLY_STATUS_FULL:
+               psy->get_property(psy, POWER_SUPPLY_PROP_CURRENT_NOW,
+                       &current_now);
                led_trigger_event(psy->charging_full_trig, LED_FULL);
-               led_trigger_event(psy->charging_trig, LED_OFF);
+               led_trigger_event(psy->charging_trig,
+                       current_now.intval > 0 ? LED_FULL : LED_OFF);
                led_trigger_event(psy->full_trig, LED_FULL);
                led_trigger_event(psy->charging_blink_full_solid_trig,
                        LED_FULL);