summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2009-09-29 12:39:23 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-10-21 21:51:10 -0700
commit2a5674f320473aca8610a9f66bb2262d1b1dc839 (patch)
treef9c2d608633f879b116160a64c2ce379486490d2
parent73932f03a6dc32f93518006eb1dfd7a72ee68537 (diff)
downloadkernel-common-2a5674f320473aca8610a9f66bb2262d1b1dc839.tar.gz
kernel-common-2a5674f320473aca8610a9f66bb2262d1b1dc839.tar.bz2
kernel-common-2a5674f320473aca8610a9f66bb2262d1b1dc839.zip
USB: digi_acceleport: Fix broken unthrottle.
commit ba6b702f85a61561d329c4c11d3ed95604924f9a upstream. This patch fixes a regression introduced in 39892da44b21b5362eb848ca424d73a25ccc488f. Signed-off-by: Johan Hovold <jhovold@gmail.com> Acked-by: Oliver Neukum <oliver@neukum.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/serial/digi_acceleport.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c
index 240aad1acaab..657fc257ff59 100644
--- a/drivers/usb/serial/digi_acceleport.c
+++ b/drivers/usb/serial/digi_acceleport.c
@@ -892,16 +892,16 @@ static void digi_rx_unthrottle(struct tty_struct *tty)
spin_lock_irqsave(&priv->dp_port_lock, flags);
- /* turn throttle off */
- priv->dp_throttled = 0;
- priv->dp_throttle_restart = 0;
-
/* restart read chain */
if (priv->dp_throttle_restart) {
port->read_urb->dev = port->serial->dev;
ret = usb_submit_urb(port->read_urb, GFP_ATOMIC);
}
+ /* turn throttle off */
+ priv->dp_throttled = 0;
+ priv->dp_throttle_restart = 0;
+
spin_unlock_irqrestore(&priv->dp_port_lock, flags);
if (ret)