[gentoo-commits] linux-patches r1539 - genpatches-2.6/trunk/2.6.28

[George Kadianakis (asn)]

Author: asn
Date: 2009-03-29 20:45:07 +0000 (Sun, 29 Mar 2009)
New Revision: 1539

Added:
   genpatches-2.6/trunk/2.6.28/2310_usblp-status-polling.patch
Modified:
   genpatches-2.6/trunk/2.6.28/0000_README
Log:
Fixes print hanging in some printers (e.g. Canon BJC-3000)

Modified: genpatches-2.6/trunk/2.6.28/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.28/0000_README	2009-03-27 06:32:47 UTC (rev 1538)
+++ genpatches-2.6/trunk/2.6.28/0000_README	2009-03-29 20:45:07 UTC (rev 1539)
@@ -111,6 +111,10 @@
 From:	http://bugs.gentoo.org/252488
 Desc:	Move some PCI code around to fix compilation on alpha
 
+Patch:	2310_usblp-status-polling.patch
+From:	http://bugs.gentoo.org/251237
+Desc:	Fixes print hanging in some printers (e.g. Canon BJC-3000)
+
 Patch:	2400_iwl3945-adhoc-disconnect-fix.patch
 From:	http://bugs.gentoo.org/254586
 Desc:	Fix adhoc disconnect issue in iwl3945

Added: genpatches-2.6/trunk/2.6.28/2310_usblp-status-polling.patch
===================================================================
--- genpatches-2.6/trunk/2.6.28/2310_usblp-status-polling.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.28/2310_usblp-status-polling.patch	2009-03-29 20:45:07 UTC (rev 1539)
@@ -0,0 +1,49 @@
+From: Pete Zaitcev <zaitcev@××××××.com>
+Date: Wed, 7 Jan 2009 00:20:42 +0000 (-0700)
+Subject: usblp: continuously poll for status
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=dd44be6b17ac52238aa6c7f46b906d9fb76e7052
+
+usblp: continuously poll for status
+
+The usblp in 2.6.18 polled for status regardless if we actually needed it.
+At some point I dropped it, to save the batteries if nothing else.
+As it turned out, printers exist (e.g. Canon BJC-3000) that need prodding
+this way or else they stop. This patch restores the old behaviour.
+If you want to save battery, don't leave jobs in the print queue.
+
+I tested this on my printers by printing and examining usbmon traces
+to make sure status is being requested and printers continue to print.
+Tuomas Jäntti verified the fix on BJC-3000.
+
+Signed-off-by: Pete Zaitcev <zaitcev@××××××.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@××××.de>
+---
+
+diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
+index 3f3ee13..d2747a4 100644
+--- a/drivers/usb/class/usblp.c
++++ b/drivers/usb/class/usblp.c
+@@ -880,16 +880,19 @@ static int usblp_wwait(struct usblp *usblp, int nonblock)
+ 		if (rc <= 0)
+ 			break;
+ 
+-		if (usblp->flags & LP_ABORT) {
+-			if (schedule_timeout(msecs_to_jiffies(5000)) == 0) {
++		if (schedule_timeout(msecs_to_jiffies(1500)) == 0) {
++			if (usblp->flags & LP_ABORT) {
+ 				err = usblp_check_status(usblp, err);
+ 				if (err == 1) {	/* Paper out */
+ 					rc = -ENOSPC;
+ 					break;
+ 				}
++			} else {
++				/* Prod the printer, Gentoo#251237. */
++				mutex_lock(&usblp->mut);
++				usblp_read_status(usblp, usblp->statusbuf);
++				mutex_unlock(&usblp->mut);
+ 			}
+-		} else {
+-			schedule();
+ 		}
+ 	}
+ 	set_current_state(TASK_RUNNING);