---

yaml --- r: 330592 b: refs/heads/master c: 96ffea8 h: refs/heads/master v: v3
git-mirror · Aug 4, 2012 · c083ed3 · c083ed3
1 parent 14b231f
commit c083ed3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git 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
@@ -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)
 {