From f56a5b8434ce43aad7deea0e18a9ba81e6280997 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 20 Nov 2008 12:10:44 -0300 Subject: [PATCH] --- yaml --- r: 124219 b: refs/heads/master c: f1990a9c39d957e6896fc506fc5388b7f302c429 h: refs/heads/master i: 124217: 305c71f0322b57ea9571a4f76e625165feb4fced 124215: 084f0da37a66b89335f4069ad21c6dfecd0e9ba7 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 068f3938d6ca..eb4b7f23ae6f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdf398eb09e3f2e1fd1acb50960ce93fe380e847 +refs/heads/master: f1990a9c39d957e6896fc506fc5388b7f302c429 diff --git a/trunk/drivers/media/video/em28xx/em28xx-core.c b/trunk/drivers/media/video/em28xx/em28xx-core.c index 9de0f5017f39..2842ddf6ddac 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-core.c +++ b/trunk/drivers/media/video/em28xx/em28xx-core.c @@ -328,7 +328,7 @@ static int set_ac97_input(struct em28xx *dev) em28xx should point to LINE IN, while AC97 should use VIDEO */ if (amux == EM28XX_AMUX_VIDEO2) - amux = dev->ctl_ainput; + amux = EM28XX_AMUX_VIDEO; /* Mute all entres but the one that were selected */ for (i = 0; i < ARRAY_SIZE(inputs); i++) {