]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
em28xx: Fix audio input for Terratec Grabby
authorMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 25 Oct 2010 20:51:15 +0000 (17:51 -0300)
committerPaul Gortmaker <paul.gortmaker@windriver.com>
Sun, 26 Jun 2011 16:46:26 +0000 (12:46 -0400)
commit a3fa904ec79b94f0db7faed010ff94d42f7d1d47 upstream.

The audio input line was wrong. Fix it.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
drivers/media/video/em28xx/em28xx-cards.c

index b0fb083377107f6b1f7ffc6668c32c5e665823d4..96339f733bc9f6ea6d6f5bcf1330f0c000969253 100644 (file)
@@ -1587,11 +1587,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] = {