Skip to contentSkip to conversation

zaurus c3000 aka spitz: fix resume

PATCH In review Pavel Machek 2 participants 3 messages Sep 30, 2009 – Oct 1, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

arch/arm/mach-pxa/sharpsl_pm.c renamed from arch/arm.ofic/mach-pxa/sharpsl_pm.c +2 -2
@@ -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;
Signature · 8 lines
(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
#1 lore raw
Quoted 6 lines · Pavel Machek

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...

Now queued up.

Next time please let me know what the git commit id is for the patch, it's necessary for me to be able to include it in the -stable tree.

thanks,

greg k-h

#2 lore raw
Quoted 9 lines · Greg KH
Quoted 6 lines · Pavel Machek

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...

Now queued up.

Thanks.

Quoted 2 lines

Next time please let me know what the git commit id is for the patch, it's necessary for me to be able to include it in the -stable tree.

Ook, will try to remember.
Pavel

Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html