Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f438d97447d4ccd241db8477f62a0647b9e8220e

Authored by Stas Sergeev
Committed by Mauro Carvalho Chehab
1 parent 0e789d7ffa
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

V4L/DVB (6225): AverTV Studio 307 has only one composite input 

AverTV Studio 307 has only one composite input.

Signed-off-by: Stas Sergeev <stsp@aknet.ru>
Acked-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

Showing 1 changed file with 2 additions and 6 deletions Side-by-side Diff

drivers/media/video/saa7134/saa7134-cards.c
Diff comments   View file @ f438d97
... ... @@ -32,6 +32,7 @@
32 32 static char name_radio[] = "Radio";
33 33 static char name_tv[] = "Television";
34 34 static char name_tv_mono[] = "TV (mono only)";
  35 +static char name_comp[] = "Composite";
35 36 static char name_comp1[] = "Composite1";
36 37 static char name_comp2[] = "Composite2";
37 38 static char name_comp3[] = "Composite3";
... ... @@ -1535,12 +1536,7 @@
1535 1536 .tv = 1,
1536 1537 .gpio = 0x00,
1537 1538 },{
1538   - .name = name_comp1,
1539   - .vmux = 0,
1540   - .amux = LINE1,
1541   - .gpio = 0x02,
1542   - },{
1543   - .name = name_comp2,
  1539 + .name = name_comp,
1544 1540 .vmux = 3,
1545 1541 .amux = LINE1,
1546 1542 .gpio = 0x02,