diff options
| author | Karsten Keil <kkeil@suse.de> | 2005-09-23 16:24:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-23 16:35:36 -0400 |
| commit | a3b5f0d43863402b03b3af9a7eaec0037a823374 (patch) | |
| tree | 8b0593dfbd596f253347272d9e026ac09a56a827 | |
| parent | 188a1eafa03aaa5e5fe6f53e637e704cd2c31c7c (diff) | |
[PATCH] hisax: remove URB_ASYNC_UNLINK
usb_unlink_urb is always async now, so URB_ASYNC_UNLINK was removed from
core USB and we must do as well.
Signed-off-by: Karsten Keil <kkeil@suse.de>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/isdn/hisax/st5481_b.c | 2 | ||||
| -rw-r--r-- | drivers/isdn/hisax/st5481_usb.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c index 0a2536d62402..657817a591fe 100644 --- a/drivers/isdn/hisax/st5481_b.c +++ b/drivers/isdn/hisax/st5481_b.c | |||
| @@ -209,9 +209,7 @@ static void st5481B_mode(struct st5481_bcs *bcs, int mode) | |||
| 209 | bcs->mode = mode; | 209 | bcs->mode = mode; |
| 210 | 210 | ||
| 211 | // Cancel all USB transfers on this B channel | 211 | // Cancel all USB transfers on this B channel |
| 212 | b_out->urb[0]->transfer_flags |= URB_ASYNC_UNLINK; | ||
| 213 | usb_unlink_urb(b_out->urb[0]); | 212 | usb_unlink_urb(b_out->urb[0]); |
| 214 | b_out->urb[1]->transfer_flags |= URB_ASYNC_UNLINK; | ||
| 215 | usb_unlink_urb(b_out->urb[1]); | 213 | usb_unlink_urb(b_out->urb[1]); |
| 216 | b_out->busy = 0; | 214 | b_out->busy = 0; |
| 217 | 215 | ||
diff --git a/drivers/isdn/hisax/st5481_usb.c b/drivers/isdn/hisax/st5481_usb.c index ffd5b2d45552..89fbeb58485d 100644 --- a/drivers/isdn/hisax/st5481_usb.c +++ b/drivers/isdn/hisax/st5481_usb.c | |||
| @@ -645,9 +645,7 @@ void st5481_in_mode(struct st5481_in *in, int mode) | |||
| 645 | 645 | ||
| 646 | in->mode = mode; | 646 | in->mode = mode; |
| 647 | 647 | ||
| 648 | in->urb[0]->transfer_flags |= URB_ASYNC_UNLINK; | ||
| 649 | usb_unlink_urb(in->urb[0]); | 648 | usb_unlink_urb(in->urb[0]); |
| 650 | in->urb[1]->transfer_flags |= URB_ASYNC_UNLINK; | ||
| 651 | usb_unlink_urb(in->urb[1]); | 649 | usb_unlink_urb(in->urb[1]); |
| 652 | 650 | ||
| 653 | if (in->mode != L1_MODE_NULL) { | 651 | if (in->mode != L1_MODE_NULL) { |
