aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@kernellabs.com>2009-09-10 23:51:48 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-18 22:47:45 -0400
commit10e01255026fb6a68b5aaa29427488ba2b35fc64 (patch)
tree354687b4a703c029d2f3af4415511424db0ebf24
parent19bf00384a6d5bbe5d7b8afbcc25772e3675d423 (diff)
V4L/DVB (12749): em28xx: remove unneeded code that set VINCTRL register
Remove redundant call to set the vinctrl register. This eliminates any ambiguity as to how the register is configured (since it is now always set in em28xx_set_outfmt). This work was sponsored by EyeMagnet Limited. Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 486db84092e3..8a06210e05d5 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -2492,13 +2492,10 @@ int em28xx_register_analog_devices(struct em28xx *dev)
2492 dev->mute = 1; 2492 dev->mute = 1;
2493 dev->volume = 0x1f; 2493 dev->volume = 0x1f;
2494 2494
2495 /* enable vbi capturing */
2496
2497/* em28xx_write_reg(dev, EM28XX_R0E_AUDIOSRC, 0xc0); audio register */ 2495/* em28xx_write_reg(dev, EM28XX_R0E_AUDIOSRC, 0xc0); audio register */
2498 val = (u8)em28xx_read_reg(dev, EM28XX_R0F_XCLK); 2496 val = (u8)em28xx_read_reg(dev, EM28XX_R0F_XCLK);
2499 em28xx_write_reg(dev, EM28XX_R0F_XCLK, 2497 em28xx_write_reg(dev, EM28XX_R0F_XCLK,
2500 (EM28XX_XCLK_AUDIO_UNMUTE | val)); 2498 (EM28XX_XCLK_AUDIO_UNMUTE | val));
2501 em28xx_write_reg(dev, EM28XX_R11_VINCTRL, 0x51);
2502 2499
2503 em28xx_set_outfmt(dev); 2500 em28xx_set_outfmt(dev);
2504 em28xx_colorlevels_set_default(dev); 2501 em28xx_colorlevels_set_default(dev);