From 37baa37cf5712e7e93c64c98c667686a5e511215 Mon Sep 17 00:00:00 2001
From: Stefan Ringel <linuxtv@stefanringel.de>
Date: Mon, 28 Nov 2011 15:46:18 -0300
Subject: [PATCH] --- yaml --- r: 285327 b: refs/heads/master c:
 8159c184cf58ac78fc868d776fa2062d1162b6e5 h: refs/heads/master i:   285325:
 98d0c4c6d061a5a64f34177ee9fa80a8381ebc91   285323:
 fa47466ddf2ff48a5bc9fe0297d5baa93953e099   285319:
 42fb108947f1e006d992498e769e3d9cabbfc537   285311:
 938aa4a383c9b500f46fb4c9a11d885b9daee87d v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/video/tm6000/tm6000-core.c  | 49 -------------------
 .../drivers/media/video/tm6000/tm6000-video.c | 21 ++++++--
 3 files changed, 18 insertions(+), 54 deletions(-)

diff --git a/[refs] b/[refs]
index a9b5651cbe6f..56d4924354ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c00ecc97bc638919ff35117290b4fab01354e8d7
+refs/heads/master: 8159c184cf58ac78fc868d776fa2062d1162b6e5
diff --git a/trunk/drivers/media/video/tm6000/tm6000-core.c b/trunk/drivers/media/video/tm6000/tm6000-core.c
index 5d7d045c652b..b16b46a70979 100644
--- a/trunk/drivers/media/video/tm6000/tm6000-core.c
+++ b/trunk/drivers/media/video/tm6000/tm6000-core.c
@@ -599,55 +599,6 @@ int tm6000_init(struct tm6000_core *dev)
 	return rc;
 }
 
-int tm6000_reset(struct tm6000_core *dev)
-{
-	int pipe;
-	int err;
-
-	msleep(500);
-
-	err = usb_set_interface(dev->udev, dev->isoc_in.bInterfaceNumber, 0);
-	if (err < 0) {
-		tm6000_err("failed to select interface %d, alt. setting 0\n",
-				dev->isoc_in.bInterfaceNumber);
-		return err;
-	}
-
-	err = usb_reset_configuration(dev->udev);
-	if (err < 0) {
-		tm6000_err("failed to reset configuration\n");
-		return err;
-	}
-
-	if ((dev->quirks & TM6000_QUIRK_NO_USB_DELAY) == 0)
-		msleep(5);
-
-	/*
-	 * Not all devices have int_in defined
-	 */
-	if (!dev->int_in.endp)
-		return 0;
-
-	err = usb_set_interface(dev->udev, dev->isoc_in.bInterfaceNumber, 2);
-	if (err < 0) {
-		tm6000_err("failed to select interface %d, alt. setting 2\n",
-				dev->isoc_in.bInterfaceNumber);
-		return err;
-	}
-
-	msleep(5);
-
-	pipe = usb_rcvintpipe(dev->udev,
-			dev->int_in.endp->desc.bEndpointAddress & USB_ENDPOINT_NUMBER_MASK);
-
-	err = usb_clear_halt(dev->udev, pipe);
-	if (err < 0) {
-		tm6000_err("usb_clear_halt failed: %d\n", err);
-		return err;
-	}
-
-	return 0;
-}
 
 int tm6000_set_audio_bitrate(struct tm6000_core *dev, int bitrate)
 {
diff --git a/trunk/drivers/media/video/tm6000/tm6000-video.c b/trunk/drivers/media/video/tm6000/tm6000-video.c
index 1e5ace0b5d10..4db3535a6b42 100644
--- a/trunk/drivers/media/video/tm6000/tm6000-video.c
+++ b/trunk/drivers/media/video/tm6000/tm6000-video.c
@@ -1609,12 +1609,25 @@ static int tm6000_release(struct file *file)
 
 		tm6000_uninit_isoc(dev);
 
+		/* Stop interrupt USB pipe */
+		tm6000_ir_int_stop(dev);
+
+		usb_reset_configuration(dev->udev);
+
+		if (&dev->int_in)
+			usb_set_interface(dev->udev,
+			dev->isoc_in.bInterfaceNumber,
+			2);
+		else
+			usb_set_interface(dev->udev,
+			dev->isoc_in.bInterfaceNumber,
+			0);
+
+		/* Start interrupt USB pipe */
+		tm6000_ir_int_start(dev);
+
 		if (!fh->radio)
 			videobuf_mmap_free(&fh->vb_vidq);
-
-		err = tm6000_reset(dev);
-		if (err < 0)
-			dev_err(&vdev->dev, "reset failed: %d\n", err);
 	}
 
 	kfree(fh);