summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-04-29 18:01:48 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-04-29 18:01:48 -0300
commit072a6b98300f11462d16d85cbf83239a6957cd91 (patch)
treeb51ab04fd8f6b8cbaa47e3b2acfe9d145cbb506e
parentbb4f5714918805dca1debaf31b897d4c4dda715a (diff)
downloadmediapointer-dvb-s2-072a6b98300f11462d16d85cbf83239a6957cd91.tar.gz
mediapointer-dvb-s2-072a6b98300f11462d16d85cbf83239a6957cd91.tar.bz2
backport commit 3444b26afa145148951112534f298bdc554ec789
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Author: David Vrabel <david.vrabel@csr.com> Date: Wed Apr 8 17:36:28 2009 +0000 USB: add reset endpoint operations Wireless USB endpoint state has a sequence number and a current window and not just a single toggle bit. So allow HCDs to provide a endpoint_reset method and call this or clear the software toggles as required (after a clear halt, set configuration etc.). usb_settoggle() and friends are then HCD internal and are moved into core/hcd.h and all device drivers call usb_reset_endpoint() instead. If the device endpoint state has been reset (with a clear halt) but the host endpoint state has not then subsequent data transfers will not complete. The device will only work again after it is reset or disconnected. CC: Mike Isely <isely@isely.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
index f3d9db69e..c0e1e2cc9 100644
--- a/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
+++ b/linux/drivers/media/video/pvrusb2/pvrusb2-hdw.c
@@ -1471,7 +1471,6 @@ static int pvr2_upload_firmware1(struct pvr2_hdw *hdw)
return ret;
}
- usb_settoggle(hdw->usb_dev, 0 & 0xf, !(0 & USB_DIR_IN), 0);
usb_clear_halt(hdw->usb_dev, usb_sndbulkpipe(hdw->usb_dev, 0 & 0x7f));
pipe = usb_sndctrlpipe(hdw->usb_dev, 0);