summaryrefslogtreecommitdiff
path: root/drivers/media/video/em28xx/em28xx-cards.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-17 21:42:14 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 14:09:42 -0300
commit89b329ef9d7cc16ed46fc991b21b2d45e7bf452c (patch)
tree1cd9ce2b15423282d50e6a96ed5ff789030e7cdf /drivers/media/video/em28xx/em28xx-cards.c
parent7640ea99339c687864f6131598e2eee2ca73cb9c (diff)
V4L/DVB (7610): em28xx: Select reg wait time based on chip ID
This is more conservative than just removing the msleep() from em28xx_write_regs_req(), since some old hardware may still need it. So, it will remove the sleep time only for those chips where this removal were tested. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 7dfea3ac9b2f..0c71e599c140 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -525,6 +525,20 @@ static void em28xx_set_model(struct em28xx *dev)
*/
void em28xx_pre_card_setup(struct em28xx *dev)
{
+ int rc;
+
+ dev->wait_after_write = 5;
+ rc = em28xx_read_reg(dev, CHIPID_REG);
+ if (rc > 0) {
+ switch (rc) {
+ case 36:
+ em28xx_info("chip ID is em2882/em2883\n");
+ dev->wait_after_write = 0;
+ break;
+ default:
+ em28xx_info("em28xx chip ID = %d\n", rc);
+ }
+ }
em28xx_set_model(dev);
/* request some modules */