diff --git a/[refs] b/[refs] index 6ee51df7f68c..2db2ec2ccc7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0fa11dbc234268c4160b81f67220308dea3c156a +refs/heads/master: f36b9ddbab408f5f5ed9105d857189b84337af48 diff --git a/trunk/drivers/power/charger-manager.c b/trunk/drivers/power/charger-manager.c index 633e41ca49ac..6ba047f5ac2c 100644 --- a/trunk/drivers/power/charger-manager.c +++ b/trunk/drivers/power/charger-manager.c @@ -482,8 +482,9 @@ static void fullbatt_vchk(struct work_struct *work) return; } - diff = desc->fullbatt_uV; - diff -= batt_uV; + diff = desc->fullbatt_uV - batt_uV; + if (diff < 0) + return; dev_info(cm->dev, "VBATT dropped %duV after full-batt.\n", diff);