aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Reding <thierry.reding@avionic-design.de>2011-12-06 07:05:03 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-12-11 07:46:58 -0500
commitfcd44b9efb0b33208a8575e5e776f4319d3b9698 (patch)
tree023b2f8162151fb3e83109f8b9b29c6e4dbcaf77
parent1fc2b5f7fb6d98c079236d57203c7b73a13c54d7 (diff)
[media] tm6000: Fix fast USB access quirk
The original patch used the fast USB quirk to enable fast access to registers in the tm6000_read_write_usb(). The applied patch moved the check to the tm6000_reset(), probably due to some merge conflicts. Signed-off-by: Thierry Reding <thierry.reding@avionic-design.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/tm6000/tm6000-core.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/tm6000/tm6000-core.c b/drivers/media/video/tm6000/tm6000-core.c
index fa37b5fc7b2..979c85b7381 100644
--- a/drivers/media/video/tm6000/tm6000-core.c
+++ b/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,
88 } 88 }
89 89
90 kfree(data); 90 kfree(data);
91 msleep(5); 91
92 if ((dev->quirks & TM6000_QUIRK_NO_USB_DELAY) == 0)
93 msleep(5);
92 94
93 mutex_unlock(&dev->usb_lock); 95 mutex_unlock(&dev->usb_lock);
94 return ret; 96 return ret;