aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/em28xx/em28xx-core.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-17 21:40:45 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 14:09:41 -0300
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 cb9f721ca28..77f64900717 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)
if (!start) {
/* disable video capture */
rc = em28xx_write_regs(dev, VINENABLE_REG, "\x27", 1);
- if (rc < 0)
- return rc;
+ return rc;
}
/* enable video capture */
rc = em28xx_write_regs_req(dev, 0x00, 0x48, "\x00", 1);
- if (rc < 0)
- return rc;
+
if (dev->mode == EM28XX_ANALOG_MODE)
rc = em28xx_write_regs(dev, VINENABLE_REG,"\x67", 1);
else
rc = em28xx_write_regs(dev, VINENABLE_REG,"\x37", 1);
- if (rc < 0)
- return rc;
-
msleep (6);
return rc;