[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <201105211927.36619.marek.vasut@gmail.com>
Date: Sat, 21 May 2011 19:27:36 +0200
From: Marek Vasut <marek.vasut@...il.com>
To: Pavel Machek <pavel@....cz>
Cc: rpurdie@...ys.net, lenz@...wisc.edu,
kernel list <linux-kernel@...r.kernel.org>, arminlitzel@....de,
Cyril Hrubis <metan@....cz>, thommycheck@...il.com,
"linux-arm-kernel" <linux-arm-kernel@...ts.infradead.org>,
dbaryshkov@...il.com, omegamoon@...il.com, eric.y.miao@...il.com,
utx@...guin.cz, zaurus-devel@...ts.linuxtogo.org
Subject: Re: spitz pm: adjust messages
On Saturday, May 21, 2011 02:24:50 PM Pavel Machek wrote:
> Charger error is something that should be reported to the syslog; do
> it. If temperature reading fails, we do not want to charge the
> battery, anyway.
>
> Signed-off-by: Pavel Machek <pavel@....cz>
>
> diff --git a/arch/arm/mach-pxa/sharpsl_pm.c
> b/arch/arm/mach-pxa/sharpsl_pm.c index 785880f..513588c 100644
> --- a/arch/arm/mach-pxa/sharpsl_pm.c
> +++ b/arch/arm/mach-pxa/sharpsl_pm.c
> @@ -317,6 +302,8 @@ static void sharpsl_charge_off(void)
>
> static void sharpsl_charge_error(void)
> {
> + dev_warn(sharpsl_pm.dev, "Charger Error\n");
> +
> sharpsl_pm_led(SHARPSL_LED_ERROR);
> sharpsl_pm.machinfo->charge(0);
> sharpsl_pm.charge_mode = CHRG_ERROR;
> @@ -513,8 +500,10 @@ static int sharpsl_check_battery_temp(void)
> val = get_select_val(buff);
>
> dev_dbg(sharpsl_pm.dev, "Temperature: %d\n", val);
> - if (val > sharpsl_pm.machinfo->charge_on_temp) {
> - printk(KERN_WARNING "Not charging: temperature out of limits.\n");
> + /* FIXME: this should catch battery read errors, but we should
> + probably avoid charging in <0C temperatures, too. */
> + if ((val < 0) || (val > sharpsl_pm.machinfo->charge_on_temp)) {
> + dev_warn(sharpsl_pm.dev, "Not charging: temperature %d out of
> limits.\n", val); return -1;
> }
Acked-by: Marek Vasut <marek.vasut@...il.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists