From: Mauro Carvalho Chehab Date: Mon, 25 Oct 2010 20:51:15 +0000 (-0300) Subject: [media] em28xx: Fix audio input for Terratec Grabby X-Git-Tag: v2.6.38-rc1~470^2~52 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a3fa904ec79b94f0db7faed010ff94d42f7d1d47;p=~shefty%2Frdma-dev.git [media] em28xx: Fix audio input for Terratec Grabby The audio input line was wrong. Fix it. Cc: stable@kernel.org Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 5d79d0eb64a..8af302b425b 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c @@ -1660,11 +1660,11 @@ struct em28xx_board em28xx_boards[] = { .input = { { .type = EM28XX_VMUX_COMPOSITE1, .vmux = SAA7115_COMPOSITE0, - .amux = EM28XX_AMUX_VIDEO2, + .amux = EM28XX_AMUX_LINE_IN, }, { .type = EM28XX_VMUX_SVIDEO, .vmux = SAA7115_SVIDEO3, - .amux = EM28XX_AMUX_VIDEO2, + .amux = EM28XX_AMUX_LINE_IN, } }, }, [EM2860_BOARD_TERRATEC_AV350] = {