Merge branches 'fixes' and 'ioremap' into for-linus

[deliverable/linux.git] / drivers / media / v4l2-core / v4l2-ioctl.c

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 691295984225cae6b4a500f5bbcfcc20490e126c..85de4557f6961e3a9c36015b69534687d13cfbc0 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -142,6 +142,7 @@ const char *v4l2_field_names[] = {
 EXPORT_SYMBOL(v4l2_field_names);
 
 const char *v4l2_type_names[] = {
+       [0]                                = "0",
        [V4L2_BUF_TYPE_VIDEO_CAPTURE]      = "vid-cap",
        [V4L2_BUF_TYPE_VIDEO_OVERLAY]      = "vid-overlay",
        [V4L2_BUF_TYPE_VIDEO_OUTPUT]       = "vid-out",
@@ -1805,6 +1806,8 @@ static int v4l_create_bufs(const struct v4l2_ioctl_ops *ops,
        if (ret)
                return ret;
 
+       CLEAR_AFTER_FIELD(create, format);
+
        v4l_sanitize_format(&create->format);
 
        ret = ops->vidioc_create_bufs(file, fh, create);