summaryrefslogtreecommitdiff
path: root/drivers/media/video/em28xx/em28xx-video.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-01-05 17:01:41 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 19:04:33 -0200
commit3abee53e4402b6ae39e1e610f9ef94eb74097138 (patch)
treebb96b460ebf6be07a127216dda86a1f896274afd /drivers/media/video/em28xx/em28xx-video.c
parent0f6dac18ccc6fb0c95f3e0269e60239661c9b4c5 (diff)
V4L/DVB (6955): Properly implement 12MHz I2S support
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-video.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index a03e9d724b5f..0f075f532eae 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -125,10 +125,6 @@ static int em28xx_config(struct em28xx *dev)
dev->mute = 1; /* maybe not the right place... */
dev->volume = 0x1f;
- /* Init XCLK_REG, audio muted */
- dev->em28xx_write_regs(dev, XCLK_REG, "\x87", 1);
-
- em28xx_audio_analog_set(dev);
em28xx_outfmt_set_yuv422(dev);
em28xx_colorlevels_set_default(dev);
em28xx_compression_disable(dev);
@@ -1688,6 +1684,9 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
/* Do board specific init and eeprom reading */
em28xx_card_setup(dev);
+ /* Configure audio */
+ em28xx_audio_analog_set(dev);
+
/* configure the device */
em28xx_config_i2c(dev);