diff options
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-video.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-video.c | 7 |
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) | |||
125 | dev->mute = 1; /* maybe not the right place... */ | 125 | dev->mute = 1; /* maybe not the right place... */ |
126 | dev->volume = 0x1f; | 126 | dev->volume = 0x1f; |
127 | 127 | ||
128 | /* Init XCLK_REG, audio muted */ | ||
129 | dev->em28xx_write_regs(dev, XCLK_REG, "\x87", 1); | ||
130 | |||
131 | em28xx_audio_analog_set(dev); | ||
132 | em28xx_outfmt_set_yuv422(dev); | 128 | em28xx_outfmt_set_yuv422(dev); |
133 | em28xx_colorlevels_set_default(dev); | 129 | em28xx_colorlevels_set_default(dev); |
134 | em28xx_compression_disable(dev); | 130 | em28xx_compression_disable(dev); |
@@ -1688,6 +1684,9 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev, | |||
1688 | /* Do board specific init and eeprom reading */ | 1684 | /* Do board specific init and eeprom reading */ |
1689 | em28xx_card_setup(dev); | 1685 | em28xx_card_setup(dev); |
1690 | 1686 | ||
1687 | /* Configure audio */ | ||
1688 | em28xx_audio_analog_set(dev); | ||
1689 | |||
1691 | /* configure the device */ | 1690 | /* configure the device */ |
1692 | em28xx_config_i2c(dev); | 1691 | em28xx_config_i2c(dev); |
1693 | 1692 | ||