aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-core.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-17 20:40:45 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:09:41 -0400
commit102a0b0879a01a413ed5f667f7db9c2085ca8474 (patch)
treedf057cd2bd569bd9fdeb586927f635d67f2ce6a6 /drivers/media/video/em28xx/em28xx-core.c
parent3421b7787a2cf41ac5edce9b5766bddd1e1d9986 (diff)
V4L/DVB (7604): em28xx-dvb: Fix analog mode
The analog entries are wrong. Fix it. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-core.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-core.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index cb9f721ca280..77f64900717d 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -331,22 +331,17 @@ int em28xx_capture_start(struct em28xx *dev, int start)
331 if (!start) { 331 if (!start) {
332 /* disable video capture */ 332 /* disable video capture */
333 rc = em28xx_write_regs(dev, VINENABLE_REG, "\x27", 1); 333 rc = em28xx_write_regs(dev, VINENABLE_REG, "\x27", 1);
334 if (rc < 0) 334 return rc;
335 return rc;
336 } 335 }
337 336
338 /* enable video capture */ 337 /* enable video capture */
339 rc = em28xx_write_regs_req(dev, 0x00, 0x48, "\x00", 1); 338 rc = em28xx_write_regs_req(dev, 0x00, 0x48, "\x00", 1);
340 if (rc < 0) 339
341 return rc;
342 if (dev->mode == EM28XX_ANALOG_MODE) 340 if (dev->mode == EM28XX_ANALOG_MODE)
343 rc = em28xx_write_regs(dev, VINENABLE_REG,"\x67", 1); 341 rc = em28xx_write_regs(dev, VINENABLE_REG,"\x67", 1);
344 else 342 else
345 rc = em28xx_write_regs(dev, VINENABLE_REG,"\x37", 1); 343 rc = em28xx_write_regs(dev, VINENABLE_REG,"\x37", 1);
346 344
347 if (rc < 0)
348 return rc;
349
350 msleep (6); 345 msleep (6);
351 346
352 return rc; 347 return rc;