diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-22 20:52:03 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-01-22 20:52:03 -0200 |
| commit | de00985e053e5742126ccd5299ac49047fecec88 (patch) | |
| tree | 552032607812c7512db3b0a271ee76c2d43626d5 /linux/drivers/media/video/em28xx/em28xx-video.c | |
| parent | 942a41fc50cf6a55b959fd4470ce7a1ace120dfb (diff) | |
| parent | c475839553c110df9e43e58998cd37d05a34de20 (diff) | |
| download | mediapointer-dvb-s2-de00985e053e5742126ccd5299ac49047fecec88.tar.gz mediapointer-dvb-s2-de00985e053e5742126ccd5299ac49047fecec88.tar.bz2 | |
merge: http://linuxtv.org/hg/~anttip/af9015/
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-video.c')
| -rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-video.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c index a2657fa3d..37577a670 100644 --- a/linux/drivers/media/video/em28xx/em28xx-video.c +++ b/linux/drivers/media/video/em28xx/em28xx-video.c @@ -2023,6 +2023,7 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev, int em28xx_register_analog_devices(struct em28xx *dev) { + u8 val; int ret; printk(KERN_INFO "%s: v4l2 driver version %d.%d.%d\n", @@ -2051,7 +2052,8 @@ int em28xx_register_analog_devices(struct em28xx *dev) /* enable vbi capturing */ /* em28xx_write_reg(dev, EM28XX_R0E_AUDIOSRC, 0xc0); audio register */ -/* em28xx_write_reg(dev, EM28XX_R0F_XCLK, 0x80); clk 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 |