From 34fa247bf976229a992db66dce46ec78cadad47c Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Thu, 1 Sep 2011 02:43:03 -0300
Subject: [PATCH] --- yaml --- r: 271864 b: refs/heads/master c:
 42845708363fc92a190f5c47e6fe750e3919f867 h: refs/heads/master v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/staging/tm6000/tm6000-core.c | 3 ++-
 trunk/drivers/staging/tm6000/tm6000.h      | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 301c43733f49..f3043bd9488f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a54b86a71dfec88d9b12f0e003ebc4ebb4b1f0a
+refs/heads/master: 42845708363fc92a190f5c47e6fe750e3919f867
diff --git a/trunk/drivers/staging/tm6000/tm6000-core.c b/trunk/drivers/staging/tm6000/tm6000-core.c
index b3c4e0529f4f..6d0803c886be 100644
--- a/trunk/drivers/staging/tm6000/tm6000-core.c
+++ b/trunk/drivers/staging/tm6000/tm6000-core.c
@@ -619,7 +619,8 @@ int tm6000_reset(struct tm6000_core *dev)
 		return err;
 	}
 
-	msleep(5);
+	if ((dev->quirks & TM6000_QUIRK_NO_USB_DELAY) == 0)
+		msleep(5);
 
 	/*
 	 * Not all devices have int_in defined
diff --git a/trunk/drivers/staging/tm6000/tm6000.h b/trunk/drivers/staging/tm6000/tm6000.h
index dac20637c696..5bdce84f8d60 100644
--- a/trunk/drivers/staging/tm6000/tm6000.h
+++ b/trunk/drivers/staging/tm6000/tm6000.h
@@ -169,6 +169,8 @@ struct tm6000_endpoint {
 	unsigned			maxsize;
 };
 
+#define TM6000_QUIRK_NO_USB_DELAY (1 << 0)
+
 struct tm6000_core {
 	/* generic device properties */
 	char				name[30];	/* name (including minor) of the device */
@@ -260,6 +262,8 @@ struct tm6000_core {
 	struct usb_isoc_ctl          isoc_ctl;
 
 	spinlock_t                   slock;
+
+	unsigned long quirks;
 };
 
 enum tm6000_ops_type {