From f5f17efbf955b48cd70ddc18b0462939a6a5a9d5 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Sat, 15 Nov 2008 17:16:11 -0300 Subject: [PATCH] --- yaml --- r: 119549 b: refs/heads/master c: 3f9b46c154da5ec4facca88f82d1820eb329fd3e h: refs/heads/master i: 119547: ab091676749da245ace655373ac6f5e68530fedc v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-core.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4e473eb3b7c3..bed04278c224 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fa37deb1a287e100c7db5b4f964784fd664bee9 +refs/heads/master: 3f9b46c154da5ec4facca88f82d1820eb329fd3e diff --git a/trunk/drivers/media/video/em28xx/em28xx-core.c b/trunk/drivers/media/video/em28xx/em28xx-core.c index 5d837c16ee22..038da614a734 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-core.c +++ b/trunk/drivers/media/video/em28xx/em28xx-core.c @@ -270,6 +270,8 @@ static int em28xx_set_audio_source(struct em28xx *dev) break; case EM28XX_AMUX_LINE_IN: input = EM28XX_AUDIO_SRC_LINE; + video = disable; + line = enable; break; case EM28XX_AMUX_AC97_VIDEO: input = EM28XX_AUDIO_SRC_LINE;