Attachment 296859 Details for Bug 431379 – Fix for recursive lock-taking

[patch] Fix for recursive lock-taking

linux-2.6.25-rc2-431371-1.diff (text/plain), 1.07 KB, created by Pete Zaitcev on 2008-03-05 07:21:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Zaitcev

Created: 2008-03-05 07:21:58 UTC

Size: 1.07 KB

patch

obsolete

>diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
>index 97fa3c4..7cfce9d 100644
>--- a/drivers/usb/serial/generic.c
>+++ b/drivers/usb/serial/generic.c
>@@ -323,7 +323,7 @@ static void flush_and_resubmit_read_urb (struct usb_serial_port *port)
> 		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);
> 		}
> 	}
> 
>@@ -349,10 +349,12 @@ void usb_serial_generic_read_bulk_callback (struct urb *urb)
> 
> 	/* Throttle the device if requested by tty */
> 	spin_lock_irqsave(&port->lock, flags);
>-	if (!(port->throttled = port->throttle_req))
>-		/* Handle data and continue reading from device */
>+	if (!(port->throttled = port->throttle_req)) {
>+		spin_unlock_irqrestore(&port->lock, flags);
> 		flush_and_resubmit_read_urb(port);
>-	spin_unlock_irqrestore(&port->lock, flags);
>+	} 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