---

yaml --- r: 285361 b: refs/heads/master c: fcd44b9 h: refs/heads/master i: 285359: 2a40933 v: v3
git-mirror · Dec 11, 2011 · a47233f · a47233f
1 parent 0b5182b
commit a47233f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;