2004-09-14 08:59:46

by Borislav Petkov

Subject: [PATCH] 2.6.9-rc1-mm5 remove usb_unlink_urb in class/cdc-acm.c

next...

Signed-off-by: Borislav Petkov <[email protected]>

--- linux-2.6.9-rc1-mm/drivers/usb/class/cdc-acm.c.orig 2004-09-14 10:56:21.000000000 +0200
+++ linux-2.6.9-rc1-mm/drivers/usb/class/cdc-acm.c 2004-09-14 10:57:48.000000000 +0200
@@ -306,9 +306,9 @@ done:
return 0;

full_bailout:
- usb_unlink_urb(acm->readurb);
+ usb_kill_urb(acm->readurb);
bail_out_and_unlink:
- usb_unlink_urb(acm->ctrlurb);
+ usb_kill_urb(acm->ctrlurb);
bail_out:
up(&open_sem);
return -EIO;
@@ -325,9 +325,9 @@ static void acm_tty_close(struct tty_str
if (!--acm->used) {
if (acm->dev) {
acm_set_control(acm, acm->ctrlout = 0);
- usb_unlink_urb(acm->ctrlurb);
- usb_unlink_urb(acm->writeurb);
- usb_unlink_urb(acm->readurb);
+ usb_kill_urb(acm->ctrlurb);
+ usb_kill_urb(acm->writeurb);
+ usb_kill_urb(acm->readurb);
} else {
tty_unregister_device(acm_tty_driver, acm->minor);
acm_table[acm->minor] = NULL;
@@ -767,9 +767,9 @@ static void acm_disconnect(struct usb_in
acm->dev = NULL;
usb_set_intfdata (intf, NULL);

- usb_unlink_urb(acm->ctrlurb);
- usb_unlink_urb(acm->readurb);
- usb_unlink_urb(acm->writeurb);
+ usb_kill_urb(acm->ctrlurb);
+ usb_kill_urb(acm->readurb);
+ usb_kill_urb(acm->writeurb);

flush_scheduled_work(); /* wait for acm_softint */

2004-09-14 19:24:54

by Greg KH

Subject: Re: [PATCH] 2.6.9-rc1-mm5 remove usb_unlink_urb in class/cdc-acm.c

On Tue, Sep 14, 2004 at 10:59:18AM +0200, Borislav Petkov wrote:
> next...

Your mailer stripped out all of the tabs again, and this patch could
not be applied :(

greg k-h