summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/em28xx/em28xx-video.c
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-video.c')
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-video.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index 1a269b643..b7c8a1fa0 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -145,10 +145,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);
@@ -1760,6 +1756,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);