]> 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)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 22:46:59 +0000 (14:46 -0800)
commit a3fa904ec79b94f0db7faed010ff94d42f7d1d47 upstream.

The audio input line was wrong. Fix it.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/media/video/em28xx/em28xx-cards.c

index e7efb4bffabdeaeea65d270ec1d63bef84695e9f..6e80376b8410a1d5609be84bd47de0facdb0be72 100644 (file)
@@ -1621,11 +1621,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] = {