From a47233f6fec301d449689865526cdcd089b76ed7 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Tue, 6 Dec 2011 09:05:03 -0300
Subject: [PATCH] --- yaml --- r: 285361 b: refs/heads/master c:
 fcd44b9efb0b33208a8575e5e776f4319d3b9698 h: refs/heads/master i:   285359:
 2a40933c9d468fb5e98840455b0676200e48ae2d v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/video/tm6000/tm6000-core.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 223224fc3fa3..5e6b6686fcc2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1fc2b5f7fb6d98c079236d57203c7b73a13c54d7
+refs/heads/master: fcd44b9efb0b33208a8575e5e776f4319d3b9698
diff --git a/trunk/drivers/media/video/tm6000/tm6000-core.c b/trunk/drivers/media/video/tm6000/tm6000-core.c
index fa37b5fc7b2a..979c85b73814 100644
--- a/trunk/drivers/media/video/tm6000/tm6000-core.c
+++ b/trunk/drivers/media/video/tm6000/tm6000-core.c
@@ -88,7 +88,9 @@ int tm6000_read_write_usb(struct tm6000_core *dev, u8 req_type, u8 req,
 	}
 
 	kfree(data);
-	msleep(5);
+
+	if ((dev->quirks & TM6000_QUIRK_NO_USB_DELAY) == 0)
+		msleep(5);
 
 	mutex_unlock(&dev->usb_lock);
 	return ret;