Messages in this thread Patch in this message | | | Date | Wed, 30 Sep 2009 22:32:52 +0200 | From | Pavel Machek <> | Subject | [patch for 2.6.31-stable] zaurus c3000 aka spitz: fix resume |
| |
Spitz resume was broken for year or likely two, and it would be very nice to fix it for 2.6.31-stable release. One liner is below...
It is in 2.6.32-rc1/2, with some more signoffs... Pavel
---
sharpsl_pm.c code tries to read battery state very early during resume, but those battery meters are connected on SPI and that's only resumed way later.
Replace the check with simple checking of battery fatal signal, that actually works at this stage.
Signed-off-by: Pavel Machek <pavel@ucw.cz> Tested-by: Stanislav Brabec <utx@penguin.cz> Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
--- linux-rc/arch/arm.ofic/mach-pxa/sharpsl_pm.c 2009-08-28 00:19:10.000000000 +0200 +++ linux-rc/arch/arm/mach-pxa/sharpsl_pm.c 2009-09-04 11:18:33.000000000 +0200 @@ -678,8 +678,8 @@ dev_dbg(sharpsl_pm.dev, "User triggered wakeup in offline charger.\n"); } - if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) || (sharpsl_fatal_check() < 0) ) - { + if ((!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_LOCK)) || + (!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_FATAL))) { dev_err(sharpsl_pm.dev, "Fatal condition. Suspend.\n"); corgi_goto_sleep(alarm_time, alarm_enable, state); return 1; -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
----- End forwarded message ----- -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
| |