Attachment 149082 Details for Bug 222083 – Candidate patch #1 (RHEL 5)

[patch] Candidate patch #1 (RHEL 5)

linux-2.6.18-10.el5-222083-1.diff (text/plain), 2.92 KB, created by Pete Zaitcev on 2007-03-02 01:58:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pete Zaitcev

Created: 2007-03-02 01:58:44 UTC

Size: 2.92 KB

patch

obsolete

>--- linux-2.6.18-10.el5/drivers/usb/class/cdc-acm.c	2006-09-19 20:42:06.000000000 -0700
>+++ linux-2.6.20-1.2923.fc6/drivers/usb/class/cdc-acm.c	2007-02-04 10:44:54.000000000 -0800
>@@ -325,7 +325,7 @@ static void acm_rx_tasklet(unsigned long
> 	struct acm_rb *buf;
> 	struct tty_struct *tty = acm->tty;
> 	struct acm_ru *rcv;
>-	//unsigned long flags;
>+	unsigned long flags;
> 	int i = 0;
> 	dbg("Entering acm_rx_tasklet");
> 
>@@ -333,15 +333,15 @@ static void acm_rx_tasklet(unsigned long
> 		return;
> 
> next_buffer:
>-	spin_lock(&acm->read_lock);
>+	spin_lock_irqsave(&acm->read_lock, flags);
> 	if (list_empty(&acm->filled_read_bufs)) {
>-		spin_unlock(&acm->read_lock);
>+		spin_unlock_irqrestore(&acm->read_lock, flags);
> 		goto urbs;
> 	}
> 	buf = list_entry(acm->filled_read_bufs.next,
> 			 struct acm_rb, list);
> 	list_del(&buf->list);
>-	spin_unlock(&acm->read_lock);
>+	spin_unlock_irqrestore(&acm->read_lock, flags);
> 
> 	dbg("acm_rx_tasklet: procesing buf 0x%p, size = %d", buf, buf->size);
> 
>@@ -356,29 +356,29 @@ next_buffer:
> 		memmove(buf->base, buf->base + i, buf->size - i);
> 		buf->size -= i;
> 		spin_unlock(&acm->throttle_lock);
>-		spin_lock(&acm->read_lock);
>+		spin_lock_irqsave(&acm->read_lock, flags);
> 		list_add(&buf->list, &acm->filled_read_bufs);
>-		spin_unlock(&acm->read_lock);
>+		spin_unlock_irqrestore(&acm->read_lock, flags);
> 		return;
> 	}
> 	spin_unlock(&acm->throttle_lock);
> 
>-	spin_lock(&acm->read_lock);
>+	spin_lock_irqsave(&acm->read_lock, flags);
> 	list_add(&buf->list, &acm->spare_read_bufs);
>-	spin_unlock(&acm->read_lock);
>+	spin_unlock_irqrestore(&acm->read_lock, flags);
> 	goto next_buffer;
> 
> urbs:
> 	while (!list_empty(&acm->spare_read_bufs)) {
>-		spin_lock(&acm->read_lock);
>+		spin_lock_irqsave(&acm->read_lock, flags);
> 		if (list_empty(&acm->spare_read_urbs)) {
>-			spin_unlock(&acm->read_lock);
>+			spin_unlock_irqrestore(&acm->read_lock, flags);
> 			return;
> 		}
> 		rcv = list_entry(acm->spare_read_urbs.next,
> 				 struct acm_ru, list);
> 		list_del(&rcv->list);
>-		spin_unlock(&acm->read_lock);
>+		spin_unlock_irqrestore(&acm->read_lock, flags);
> 
> 		buf = list_entry(acm->spare_read_bufs.next,
> 				 struct acm_rb, list);
>@@ -400,9 +400,9 @@ urbs:
> 		   free-urbs-pool and resubmited ASAP */
> 		if (usb_submit_urb(rcv->urb, GFP_ATOMIC) < 0) {
> 			list_add(&buf->list, &acm->spare_read_bufs);
>-			spin_lock(&acm->read_lock);
>+			spin_lock_irqsave(&acm->read_lock, flags);
> 			list_add(&rcv->list, &acm->spare_read_urbs);
>-			spin_unlock(&acm->read_lock);
>+			spin_unlock_irqrestore(&acm->read_lock, flags);
> 			return;
> 		}
> 	}
>@@ -1083,6 +1083,9 @@ static struct usb_device_id acm_ids[] = 
> 	{ USB_DEVICE(0x0482, 0x0203), /* KYOCERA AH-K3001V */
> 	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */
> 	},
>+	{ USB_DEVICE(0x079b, 0x000f), /* BT On-Air USB MODEM */
>+	.driver_info = NO_UNION_NORMAL, /* has no union descriptor */
>+	},
> 	{ USB_DEVICE(0x0ace, 0x1608), /* ZyDAS 56K USB MODEM */
> 	.driver_info = SINGLE_RX_URB, /* firmware bug */
> 	},

Actions: View | Diff

Attachments on bug 222083: 145220 | 149082