Attachment 296951 Details for Bug 431379 – Pete's patch adapted to 2.6.23.15 kernel version

[patch] Pete's patch adapted to 2.6.23.15 kernel version

linux-2.6-usbserial-patch.patch (text/plain), 1.18 KB, created by Dmitry Burstein on 2008-03-05 22:29:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Burstein

Created: 2008-03-05 22:29:49 UTC

Size: 1.18 KB

patch

obsolete

>diff -uNrp a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
>--- a/drivers/usb/serial/generic.c        2008-03-05 22:23:50.000000000 +0200
>+++ b/drivers/usb/serial/generic.c    2008-03-05 22:42:41.000000000 +0200
>@@ -315,7 +315,7 @@ static void flush_and_resubmit_read_urb 
>		room = tty_buffer_request_room(tty, urb->actual_length);
>		if (room) {
>			tty_insert_flip_string(tty, urb->transfer_buffer, room);
>-			tty_flip_buffer_push(tty); /* is this allowed from an URB callback ? */
>+			tty_flip_buffer_push(tty);
>		}
>	}
>
>@@ -338,12 +338,15 @@ void usb_serial_generic_read_bulk_callba
> 
>	usb_serial_debug_data(debug, &port->dev, __FUNCTION__, urb->actual_length, data);
>
>+	unsigned long flags;
>	/* Throttle the device if requested by tty */
>-	spin_lock(&port->lock);
>-	if (!(port->throttled = port->throttle_req))
>-		/* Handle data and continue reading from device */
>+	spin_lock_irqsave(&port->lock, flags);
>+	if (!(port->throttled = port->throttle_req)) {
>+		spin_unlock_irqrestore(&port->lock, flags);
>		flush_and_resubmit_read_urb(port);
>-	spin_unlock(&port->lock);
>+	} else {
>+		spin_unlock_irqrestore(&port->lock, flags);
>+	}
> }
> EXPORT_SYMBOL_GPL(usb_serial_generic_read_bulk_callback);

Actions: View | Diff

Attachments on bug 431379: 293841 | 296661 | 296683 | 296859 | 296903 | 296951