| Date | Thu, 27 Sep 2012 20:00:57 -0700 | From | Anton Vorontsov <> | Subject | Re: [PATCH 56/57] power: abx500_chargalg: Fix quick re-attach charger issue. |
| |
On Tue, Sep 25, 2012 at 10:12:53AM -0600, mathieu.poirier@linaro.org wrote: > From: Marcus Cooper <marcus.xm.cooper@stericsson.com> > > The patch for 426250 added a change to check for the quick
What is 426250? I guess it's some internal bug#... but since we don't have access to that info, it's better to describe which upstream commit caused this.
> re-attachment of the charger connection as an error in the > AB8500 HW meant that a quick detach/attach wouldn't be > detected. > This patch isolates the original change so that newer AB's > are not affected. > > Signed-off-by: Marcus Cooper <marcus.xm.cooper@stericsson.com> > Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> > Reviewed-by: Martin SJOBLOM <martin.w.sjoblom@stericsson.com> > Reviewed-by: Hakan BERG <hakan.berg@stericsson.com> > Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> > --- > drivers/power/abx500_chargalg.c | 11 ++++++----- > 1 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/drivers/power/abx500_chargalg.c b/drivers/power/abx500_chargalg.c > index c8849af..7a81e4e 100644 > --- a/drivers/power/abx500_chargalg.c > +++ b/drivers/power/abx500_chargalg.c > @@ -1299,11 +1299,12 @@ static void abx500_chargalg_algorithm(struct abx500_chargalg *di) > abx500_chargalg_check_charger_voltage(di); > charger_status = abx500_chargalg_check_charger_connection(di); > > - ret = abx500_chargalg_check_charger_enable(di); > - if (ret < 0) > - dev_err(di->dev, "Checking charger if enabled error: %d line: %d\n", > - ret, __LINE__); > - > + if (is_ab8500(di->parent)) { > + ret = abx500_chargalg_check_charger_enable(di); > + if (ret < 0) > + dev_err(di->dev, "Checking charger is enabled error"); > + dev_err(di->dev, ": Returned Value %d\n", ret);
Ouch. Missing braces. No need for two dev_err().
> + } > /* > * First check if we have a charger connected. > * Also we don't allow charging of unknown batteries if configured > -- > 1.7.5.4
|