aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-06-06 15:01:32 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-04 07:56:26 -0300
commit96ffea88cddd9bd873a03a7c8c65d015a9d56490 (patch)
tree3bf20fd574eb39062c6dd87d262dec993ea5dc25
parent4f208d4e2d871c2416c9a86695d6f7d17e76349b (diff)
[media] dvb_usb_v2: remove usb_clear_halt()
Calling usb_clear_halt() during device init is not correct. 2 of 7 AF9015 devices I have timeouts next USB control message after usb_clear_halt(). It was originally performed between tuner_attach() and rc_query() and likely not causing problems since rc_query() is repeated continously. None could see it when first rc_query() failed... Secondly it was not called for .generic_bulk_ctrl_endpoint_response. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/dvb/dvb-usb/dvb_usb_init.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
index d7a6efc9a52..581be9d990a 100644
--- a/drivers/media/dvb/dvb-usb/dvb_usb_init.c
+++ b/drivers/media/dvb/dvb-usb/dvb_usb_init.c
@@ -145,17 +145,6 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d)
d->state |= DVB_USB_STATE_DVB;
}
- /*
- * when reloading the driver w/o replugging the device
- * sometimes a timeout occures, this helps
- */
- if (d->props.generic_bulk_ctrl_endpoint != 0) {
- usb_clear_halt(d->udev, usb_sndbulkpipe(d->udev,
- d->props.generic_bulk_ctrl_endpoint));
- usb_clear_halt(d->udev, usb_rcvbulkpipe(d->udev,
- d->props.generic_bulk_ctrl_endpoint));
- }
-
return 0;
err:
pr_debug("%s: failed=%d\n", __func__, ret);
@@ -177,7 +166,6 @@ static int dvb_usb_adapter_exit(struct dvb_usb_device *d)
return 0;
}
-
/* general initialization functions */
static int dvb_usb_exit(struct dvb_usb_device *d)
{