From e198109ef2b94f94734d4c88bef5ffe866a85a25 Mon Sep 17 00:00:00 2001
From: Thierry Reding <thierry.reding@avionic-design.de>
Date: Thu, 1 Sep 2011 02:43:04 -0300
Subject: [PATCH] --- yaml --- r: 271865 b: refs/heads/master c:
 6e89648195eba51ae7f6de9104fdb2e0920b4aef h: refs/heads/master i:   271863:
 c512782e4aa0334f37637ae3ae0fce24f844507e v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/tm6000/tm6000-cards.c | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f3043bd9488f..b8db5a17bd7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42845708363fc92a190f5c47e6fe750e3919f867
+refs/heads/master: 6e89648195eba51ae7f6de9104fdb2e0920b4aef
diff --git a/trunk/drivers/staging/tm6000/tm6000-cards.c b/trunk/drivers/staging/tm6000/tm6000-cards.c
index 8483c562556e..ec2578a0fdf7 100644
--- a/trunk/drivers/staging/tm6000/tm6000-cards.c
+++ b/trunk/drivers/staging/tm6000/tm6000-cards.c
@@ -999,6 +999,16 @@ static int fill_board_specific_data(struct tm6000_core *dev)
 	dev->vinput[2] = tm6000_boards[dev->model].vinput[2];
 	dev->rinput = tm6000_boards[dev->model].rinput;
 
+	/* setup per-model quirks */
+	switch (dev->model) {
+	case TM6010_BOARD_TERRATEC_CINERGY_HYBRID_XE:
+		dev->quirks |= TM6000_QUIRK_NO_USB_DELAY;
+		break;
+
+	default:
+		break;
+	}
+
 	/* initialize hardware */
 	rc = tm6000_init(dev);
 	if (rc < 0)