Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (97 commits)
  USB: qcserial: add device id for HP devices
  USB: isp1760: Add a delay before reading the SKIPMAP registers in isp1760-hcd.c
  USB: allow malformed LANGID descriptors
  USB: pxa27x_udc: typo fixes and code cleanups
  USB: gadget: gadget zero uses new suspend/resume hooks
  USB: gadget: composite device-level suspend/resume hooks
  USB: r8a66597-hcd: suspend/resume support
  USB: more u32 conversion after transfer_buffer_length and actual_length
  USB: Fix cp2101 USB serial device driver termios functions for console use
  USB: CP2101 New Device ID
  USB: ipaq: handle 4 endpoint devices
  USB: S3C: Move usb-control.h to platform include
  USB: ohci-hcd: Add ARCH_S3C24XX to the ohci-s3c2410.c glue
  USB: pedantic: spelling correction in comment for ch9.h
  USB: host: fix sparse warning: Using plain integer as NULL pointer
  USB: ohci-s3c2410: fix name of bus clock
  USB: ohci-s3c2410: remove <mach/hardware.h> include
  USB: serial: rename cp2101 driver to cp210x
  USB: CP2101 Reduce Error Logging
  USB: CP2101 Support AN205 baud rates
  ...

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c
index 3f3ee1351930..d2747a49b974 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);