From c083ed329aff4434a96f7c96b8513e2218731541 Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Wed, 6 Jun 2012 15:01:32 -0300 Subject: [PATCH] --- yaml --- r: 330592 b: refs/heads/master c: 96ffea88cddd9bd873a03a7c8c65d015a9d56490 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 21554cabdcc5..ef36f01b6055 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f208d4e2d871c2416c9a86695d6f7d17e76349b +refs/heads/master: 96ffea88cddd9bd873a03a7c8c65d015a9d56490 diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c b/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c index d7a6efc9a52e..581be9d990a0 100644 --- a/trunk/drivers/media/dvb/dvb-usb/dvb_usb_init.c +++ b/trunk/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) {