aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/saa7127.c4
-rw-r--r--drivers/media/video/v4l2-common.c5
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/media/video/saa7127.c b/drivers/media/video/saa7127.c
index 654863db1591..50dbb76d4a7f 100644
--- a/drivers/media/video/saa7127.c
+++ b/drivers/media/video/saa7127.c
@@ -550,12 +550,12 @@ static int saa7127_command(struct i2c_client *client,
550 struct v4l2_routing *route = arg; 550 struct v4l2_routing *route = arg;
551 551
552 switch (cmd) { 552 switch (cmd) {
553 case VIDIOC_S_STD: 553 case VIDIOC_INT_S_STD_OUTPUT:
554 if (state->std == *(v4l2_std_id *)arg) 554 if (state->std == *(v4l2_std_id *)arg)
555 break; 555 break;
556 return saa7127_set_std(client, *(v4l2_std_id *)arg); 556 return saa7127_set_std(client, *(v4l2_std_id *)arg);
557 557
558 case VIDIOC_G_STD: 558 case VIDIOC_INT_G_STD_OUTPUT:
559 *(v4l2_std_id *)arg = state->std; 559 *(v4l2_std_id *)arg = state->std;
560 break; 560 break;
561 561
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index 740ea5a9202f..4a3635cd6f9e 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -420,7 +420,10 @@ static const char *v4l2_int_ioctls[] = {
420 [_IOC_NR(VIDIOC_INT_G_AUDIO_ROUTING)] = "VIDIOC_INT_G_AUDIO_ROUTING", 420 [_IOC_NR(VIDIOC_INT_G_AUDIO_ROUTING)] = "VIDIOC_INT_G_AUDIO_ROUTING",
421 [_IOC_NR(VIDIOC_INT_S_VIDEO_ROUTING)] = "VIDIOC_INT_S_VIDEO_ROUTING", 421 [_IOC_NR(VIDIOC_INT_S_VIDEO_ROUTING)] = "VIDIOC_INT_S_VIDEO_ROUTING",
422 [_IOC_NR(VIDIOC_INT_G_VIDEO_ROUTING)] = "VIDIOC_INT_G_VIDEO_ROUTING", 422 [_IOC_NR(VIDIOC_INT_G_VIDEO_ROUTING)] = "VIDIOC_INT_G_VIDEO_ROUTING",
423 [_IOC_NR(VIDIOC_INT_S_CRYSTAL_FREQ)] = "VIDIOC_INT_S_CRYSTAL_FREQ" 423 [_IOC_NR(VIDIOC_INT_S_CRYSTAL_FREQ)] = "VIDIOC_INT_S_CRYSTAL_FREQ",
424 [_IOC_NR(VIDIOC_INT_INIT)] = "VIDIOC_INT_INIT",
425 [_IOC_NR(VIDIOC_INT_G_STD_OUTPUT)] = "VIDIOC_INT_G_STD_OUTPUT",
426 [_IOC_NR(VIDIOC_INT_S_STD_OUTPUT)] = "VIDIOC_INT_S_STD_OUTPUT",
424}; 427};
425#define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls) 428#define V4L2_INT_IOCTLS ARRAY_SIZE(v4l2_int_ioctls)
426 429