2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Mauro Carvalho Chehab <[email protected]> commit a3fa904ec79b94f0db7faed010ff94d42f7d1d47 upstream. The audio input line was wrong. Fix it. Signed-off-by: Mauro Carvalho Chehab <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- drivers/media/video/em28xx/em28xx-cards.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6.35.y/drivers/media/video/em28xx/em28xx-cards.c =================================================================== --- linux-2.6.35.y.orig/drivers/media/video/em28xx/em28xx-cards.c 2011-03-29 22:51:52.060391073 -0700 +++ linux-2.6.35.y/drivers/media/video/em28xx/em28xx-cards.c 2011-03-29 23:02:59.085323575 -0700 @@ -1605,11 +1605,11 @@ .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] = { _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
