Skip to contentSkip to conversation

USB: digi_acceleport: Fix broken unthrottle.

PATCH In review Johan Hovold 2 participants 4 messages Sep 29, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 USB: digi_acceleport: Fix broken unthrottle.

This patch fixes a regression introduced in
39892da44b21b5362eb848ca424d73a25ccc488f.

---

Hi,

This patch is untested as I haven't got the hardware, but seems straight-forward to me.

Can you verify, Oliver?

Thanks,
Johan

 drivers/usb/serial/digi_acceleport.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/usb/serial/digi_acceleport.c +4 -4
index ab3dd99..68e80be 100644
@@ -898,16 +898,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)
Signature · 1 line
1.6.4.2
#1 lore raw

Am Dienstag, 29. September 2009 12:39:23 schrieb Johan Hovold:

Quoted 4 lines

This patch is untested as I haven't got the hardware, but seems straight-forward to me.

Can you verify, Oliver?

I would prefer to see a check in usb-serial.c::serial_unthrottle()

Regards
Oliver

#2 lore raw
Quoted 7 lines · Oliver Neukum

Am Dienstag, 29. September 2009 12:39:23 schrieb Johan Hovold:

Quoted 4 lines

This patch is untested as I haven't got the hardware, but seems straight-forward to me.

Can you verify, Oliver?

I would prefer to see a check in usb-serial.c::serial_unthrottle()

This is completely unrelated to the unthrottle issue discussed elsewhere. :)

The digi_acceleport unthrottle code should (and used to) check priv->dp_throttle_restart to determine whether to resubmit and then cleared the flag. The commit mentioned mistakenly, I assume, reversed this. Plain bug. Right?

Acked-by
#3 lore raw

Am Dienstag, 29. September 2009 13:35:18 schrieb Johan Hovold:

Quoted 9 lines · Oliver Neukum
Quoted 7 lines

Am Dienstag, 29. September 2009 12:39:23 schrieb Johan Hovold:

Quoted 4 lines

This patch is untested as I haven't got the hardware, but seems straight-forward to me.

Can you verify, Oliver?

I would prefer to see a check in usb-serial.c::serial_unthrottle()

Quoted 7 lines

This is completely unrelated to the unthrottle issue discussed elsewhere. :)

The digi_acceleport unthrottle code should (and used to) check priv->dp_throttle_restart to determine whether to resubmit and then cleared the flag. The commit mentioned mistakenly, I assume, reversed this. Plain bug. Right?

Eek. Yes, sorry. Unthrotteling as I currently made it cannot work. Your fix is completely correct.

Regards
Oliver