diff options
Diffstat (limited to 'drivers/media/v4l2-core/v4l2-ioctl.c')
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-ioctl.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c index 1441a73ce64c..ca85c3a9a7b9 100644 --- a/drivers/media/v4l2-core/v4l2-ioctl.c +++ b/drivers/media/v4l2-core/v4l2-ioctl.c | |||
| @@ -1552,7 +1552,8 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, | |||
| 1552 | break; | 1552 | break; |
| 1553 | CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func); | 1553 | CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func); |
| 1554 | for (i = 0; i < p->fmt.pix_mp.num_planes; i++) | 1554 | for (i = 0; i < p->fmt.pix_mp.num_planes; i++) |
| 1555 | CLEAR_AFTER_FIELD(p, fmt.pix_mp.plane_fmt[i].bytesperline); | 1555 | CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i], |
| 1556 | bytesperline); | ||
| 1556 | return ops->vidioc_s_fmt_vid_cap_mplane(file, fh, arg); | 1557 | return ops->vidioc_s_fmt_vid_cap_mplane(file, fh, arg); |
| 1557 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 1558 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
| 1558 | if (unlikely(!ops->vidioc_s_fmt_vid_overlay)) | 1559 | if (unlikely(!ops->vidioc_s_fmt_vid_overlay)) |
| @@ -1582,7 +1583,8 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops, | |||
| 1582 | break; | 1583 | break; |
| 1583 | CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func); | 1584 | CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func); |
| 1584 | for (i = 0; i < p->fmt.pix_mp.num_planes; i++) | 1585 | for (i = 0; i < p->fmt.pix_mp.num_planes; i++) |
| 1585 | CLEAR_AFTER_FIELD(p, fmt.pix_mp.plane_fmt[i].bytesperline); | 1586 | CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i], |
| 1587 | bytesperline); | ||
| 1586 | return ops->vidioc_s_fmt_vid_out_mplane(file, fh, arg); | 1588 | return ops->vidioc_s_fmt_vid_out_mplane(file, fh, arg); |
| 1587 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | 1589 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: |
| 1588 | if (unlikely(!ops->vidioc_s_fmt_vid_out_overlay)) | 1590 | if (unlikely(!ops->vidioc_s_fmt_vid_out_overlay)) |
| @@ -1649,7 +1651,8 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, | |||
| 1649 | break; | 1651 | break; |
| 1650 | CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func); | 1652 | CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func); |
| 1651 | for (i = 0; i < p->fmt.pix_mp.num_planes; i++) | 1653 | for (i = 0; i < p->fmt.pix_mp.num_planes; i++) |
| 1652 | CLEAR_AFTER_FIELD(p, fmt.pix_mp.plane_fmt[i].bytesperline); | 1654 | CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i], |
| 1655 | bytesperline); | ||
| 1653 | return ops->vidioc_try_fmt_vid_cap_mplane(file, fh, arg); | 1656 | return ops->vidioc_try_fmt_vid_cap_mplane(file, fh, arg); |
| 1654 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: | 1657 | case V4L2_BUF_TYPE_VIDEO_OVERLAY: |
| 1655 | if (unlikely(!ops->vidioc_try_fmt_vid_overlay)) | 1658 | if (unlikely(!ops->vidioc_try_fmt_vid_overlay)) |
| @@ -1679,7 +1682,8 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops, | |||
| 1679 | break; | 1682 | break; |
| 1680 | CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func); | 1683 | CLEAR_AFTER_FIELD(p, fmt.pix_mp.xfer_func); |
| 1681 | for (i = 0; i < p->fmt.pix_mp.num_planes; i++) | 1684 | for (i = 0; i < p->fmt.pix_mp.num_planes; i++) |
| 1682 | CLEAR_AFTER_FIELD(p, fmt.pix_mp.plane_fmt[i].bytesperline); | 1685 | CLEAR_AFTER_FIELD(&p->fmt.pix_mp.plane_fmt[i], |
| 1686 | bytesperline); | ||
| 1683 | return ops->vidioc_try_fmt_vid_out_mplane(file, fh, arg); | 1687 | return ops->vidioc_try_fmt_vid_out_mplane(file, fh, arg); |
| 1684 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: | 1688 | case V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY: |
| 1685 | if (unlikely(!ops->vidioc_try_fmt_vid_out_overlay)) | 1689 | if (unlikely(!ops->vidioc_try_fmt_vid_out_overlay)) |