summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@kernellabs.com>2009-09-10 23:51:48 -0400
committerDevin Heitmueller <dheitmueller@kernellabs.com>2009-09-10 23:51:48 -0400
commit4096af2a99f354182f630f03bf2a97c100a14bd8 (patch)
treefa9700d05ce712714286fc59e55d12cd42e5a1ef /linux
parent2726f365e349962c9a313686a5c0f9b3989d5dbd (diff)
downloadmediapointer-dvb-s2-4096af2a99f354182f630f03bf2a97c100a14bd8.tar.gz
mediapointer-dvb-s2-4096af2a99f354182f630f03bf2a97c100a14bd8.tar.bz2
em28xx: remove unneeded code that set VINCTRL register
From: Devin Heitmueller <dheitmueller@kernellabs.com> 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. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-video.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index d00e78659..596e51f90 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -2543,15 +2543,10 @@ int em28xx_register_analog_devices(struct em28xx *dev)
dev->mute = 1;
dev->volume = 0x1f;
-#if 1
- /* enable vbi capturing */
-
/* em28xx_write_reg(dev, EM28XX_R0E_AUDIOSRC, 0xc0); audio register */
val = (u8)em28xx_read_reg(dev, EM28XX_R0F_XCLK);
em28xx_write_reg(dev, EM28XX_R0F_XCLK,
(EM28XX_XCLK_AUDIO_UNMUTE | val));
- em28xx_write_reg(dev, EM28XX_R11_VINCTRL, 0x51);
-#endif
em28xx_set_outfmt(dev);
em28xx_colorlevels_set_default(dev);