aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/misc/usbtest.c
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@hera.kernel.org>2005-09-09 08:19:10 -0700
committerAnton Altaparmakov <aia21@hera.kernel.org>2005-09-09 08:19:10 -0700
commitddcc95963449d028b16d9b9fe50f6e91ce7d9e81 (patch)
treeaaf0392346a18b3e232ddeb5db3c4e917f7ca686 /drivers/usb/misc/usbtest.c
parent223176bc722a7bf519904180e956292ae1d1e819 (diff)
parent5f5024130287a9467a41b9f94ec170958ae45cbd (diff)
downloadkernel_samsung_smdk4412-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.tar.gz
kernel_samsung_smdk4412-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.tar.bz2
kernel_samsung_smdk4412-ddcc95963449d028b16d9b9fe50f6e91ce7d9e81.zip
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.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/usb/misc/usbtest.c b/drivers/usb/misc/usbtest.c
index fd7fb98e4b2..54799eb0bc6 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)
u->context = &context;
u->complete = ctrl_complete;
- u->transfer_flags |= URB_ASYNC_UNLINK;
}
/* queue the urbs */
@@ -1052,7 +1051,6 @@ static int unlink1 (struct usbtest_dev *dev, int pipe, int size, int async)
urb = simple_alloc_urb (testdev_to_usbdev (dev), pipe, size);
if (!urb)
return -ENOMEM;
- urb->transfer_flags |= URB_ASYNC_UNLINK;
urb->context = &completion;
urb->complete = unlink1_callback;