Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / drivers / media / video / v4l2-subdev.c

diff --git a/drivers/media/video/v4l2-subdev.c b/drivers/media/video/v4l2-subdev.c
index 21208805ea9bb67991de26a14738cf2b486247d2..dc881671d536993e98616711304ba04164c27bca 100644 (file)
--- a/drivers/media/video/v4l2-subdev.c
+++ b/drivers/media/video/v4l2-subdev.c
@@ -33,6 +33,12 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg)
                return v4l2_subdev_call(sd, core, g_ctrl, arg);
        case VIDIOC_S_CTRL:
                return v4l2_subdev_call(sd, core, s_ctrl, arg);
+       case VIDIOC_G_EXT_CTRLS:
+               return v4l2_subdev_call(sd, core, g_ext_ctrls, arg);
+       case VIDIOC_S_EXT_CTRLS:
+               return v4l2_subdev_call(sd, core, s_ext_ctrls, arg);
+       case VIDIOC_TRY_EXT_CTRLS:
+               return v4l2_subdev_call(sd, core, try_ext_ctrls, arg);
        case VIDIOC_QUERYMENU:
                return v4l2_subdev_call(sd, core, querymenu, arg);
        case VIDIOC_LOG_STATUS:
@@ -92,16 +98,28 @@ int v4l2_subdev_command(struct v4l2_subdev *sd, unsigned cmd, void *arg)
                return v4l2_subdev_call(sd, video, g_vbi_data, arg);
        case VIDIOC_G_SLICED_VBI_CAP:
                return v4l2_subdev_call(sd, video, g_sliced_vbi_cap, arg);
+       case VIDIOC_ENUM_FMT:
+               return v4l2_subdev_call(sd, video, enum_fmt, arg);
+       case VIDIOC_TRY_FMT:
+               return v4l2_subdev_call(sd, video, try_fmt, arg);
        case VIDIOC_S_FMT:
                return v4l2_subdev_call(sd, video, s_fmt, arg);
        case VIDIOC_G_FMT:
                return v4l2_subdev_call(sd, video, g_fmt, arg);
        case VIDIOC_INT_S_STD_OUTPUT:
                return v4l2_subdev_call(sd, video, s_std_output, *(v4l2_std_id *)arg);
+       case VIDIOC_QUERYSTD:
+               return v4l2_subdev_call(sd, video, querystd, arg);
+       case VIDIOC_INT_G_INPUT_STATUS:
+               return v4l2_subdev_call(sd, video, g_input_status, arg);
        case VIDIOC_STREAMON:
                return v4l2_subdev_call(sd, video, s_stream, 1);
        case VIDIOC_STREAMOFF:
                return v4l2_subdev_call(sd, video, s_stream, 0);
+       case VIDIOC_S_PARM:
+               return v4l2_subdev_call(sd, video, s_parm, arg);
+       case VIDIOC_G_PARM:
+               return v4l2_subdev_call(sd, video, g_parm, arg);
 
        default:
                return v4l2_subdev_call(sd, core, ioctl, cmd, arg);