diff options
| author | Ezequiel Garcia <elezegarcia@gmail.com> | 2012-10-09 18:01:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-09 21:54:26 -0300 |
| commit | 56a960bf3fedc7dcf72ae072a64ffffe584e1f0e (patch) | |
| tree | 2d4f34d467752a78dcef92c2001467dc45a6210e /drivers/media/usb/stk1160/stk1160-v4l.c | |
| parent | d6d022e7382343b57184c83f5fea0532be240b98 (diff) | |
| download | linux-56a960bf3fedc7dcf72ae072a64ffffe584e1f0e.tar.bz2 | |
[media] stk1160: Add support for S-Video input
In order to fully replace easycap driver with stk1160,
it's also necessary to add S-Video support.
A similar patch backported for v3.2 kernel has been
tested by three different users.
Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/usb/stk1160/stk1160-v4l.c')
| -rw-r--r-- | drivers/media/usb/stk1160/stk1160-v4l.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c index fe6e857969ca..6694f9e2ca57 100644 --- a/drivers/media/usb/stk1160/stk1160-v4l.c +++ b/drivers/media/usb/stk1160/stk1160-v4l.c @@ -419,7 +419,12 @@ static int vidioc_enum_input(struct file *file, void *priv, if (i->index > STK1160_MAX_INPUT) return -EINVAL; - sprintf(i->name, "Composite%d", i->index); + /* S-Video special handling */ + if (i->index == STK1160_SVIDEO_INPUT) + sprintf(i->name, "S-Video"); + else + sprintf(i->name, "Composite%d", i->index); + i->type = V4L2_INPUT_TYPE_CAMERA; i->std = dev->vdev.tvnorms; return 0; |