projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c7e242b)
[media] Change the second input names to include " 2" to distinguish them
authorGavin Hurlbut <gjhurlbu@gmail.com>
Tue, 28 Sep 2010 02:50:43 +0000 (23:50 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Thu, 21 Oct 2010 09:55:28 +0000 (07:55 -0200)
Signed-off-by: Gavin Hurlbut <gjhurlbu@gmail.com>
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/saa7164/saa7164-encoder.c patch | blob | blame | history
drivers/media/video/saa7164/saa7164-vbi.c patch | blob | blame | history

diff --git a/drivers/media/video/saa7164/saa7164-encoder.c b/drivers/media/video/saa7164/saa7164-encoder.c
index 2e7d2856d39bb6258cf70778fc2354342c7ca261..edd888ec3c9be60c416d4afd293625f822a21dad 100644 (file)
--- a/drivers/media/video/saa7164/saa7164-encoder.c
+++ b/drivers/media/video/saa7164/saa7164-encoder.c
@@ -239,7 +239,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
        int n;
 
        char *inputs[] = { "tuner", "composite", "svideo", "aux",
-               "composite", "svideo", "aux" };
+               "composite 2", "svideo 2", "aux 2" };
 
        if (i->index >= 7)
                return -EINVAL;
diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c
index 651f40409ae0071d7b03ae79316f2f0043c782fa..c9b124cdd57e80ae6c3d7a16a25d3a0949a3fb1b 100644 (file)
--- a/drivers/media/video/saa7164/saa7164-vbi.c
+++ b/drivers/media/video/saa7164/saa7164-vbi.c
@@ -213,7 +213,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
        int n;
 
        char *inputs[] = { "tuner", "composite", "svideo", "aux",
-               "composite", "svideo", "aux" };
+               "composite 2", "svideo 2", "aux 2" };
 
        if (i->index >= 7)
                return -EINVAL;