diff options
author | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@hera.kernel.org> | 2005-09-09 11:19:10 -0400 |
commit | ddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch) | |
tree | aaf0392346a18b3e232ddeb5db3c4e917f7ca686 /drivers/usb/misc/usbtest.c | |
parent | 223176bc722a7bf519904180e956292ae1d1e819 (diff) | |
parent | 5f5024130287a9467a41b9f94ec170958ae45cbd (diff) |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/usb/misc/usbtest.c')
-rw-r--r-- | drivers/usb/misc/usbtest.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c index fd7fb98e4b20..54799eb0bc60 100644 --- a/drivers/usb/misc/usbtest.c +++ b/drivers/usb/misc/usbtest.c | |||
@@ -986,7 +986,6 @@ test_ctrl_queue (struct usbtest_dev *dev, struct usbtest_param *param) | |||
986 | 986 | ||
987 | u->context = &context; | 987 | u->context = &context; |
988 | u->complete = ctrl_complete; | 988 | u->complete = ctrl_complete; |
989 | u->transfer_flags |= URB_ASYNC_UNLINK; | ||
990 | } | 989 | } |
991 | 990 | ||
992 | /* queue the urbs */ | 991 | /* queue the urbs */ |
@@ -1052,7 +1051,6 @@ static int unlink1 (struct usbtest_dev *dev, int pipe, int size, int async) | |||
1052 | urb = simple_alloc_urb (testdev_to_usbdev (dev), pipe, size); | 1051 | urb = simple_alloc_urb (testdev_to_usbdev (dev), pipe, size); |
1053 | if (!urb) | 1052 | if (!urb) |
1054 | return -ENOMEM; | 1053 | return -ENOMEM; |
1055 | urb->transfer_flags |= URB_ASYNC_UNLINK; | ||
1056 | urb->context = &completion; | 1054 | urb->context = &completion; |
1057 | urb->complete = unlink1_callback; | 1055 | urb->complete = unlink1_callback; |
1058 | 1056 | ||