1 files changed, 14 insertions, 12 deletions

diff --git a/drivers/usb/gadget/function/uvc_queue.c b/drivers/usb/gadget/function/uvc_queue.c
index d617c39a0052..3628938785ac 100644
--- a/drivers/usb/gadget/function/uvc_queue.c
+++ b/drivers/usb/gadget/function/uvc_queue.c
@@ -61,9 +61,10 @@ static int uvc_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 static int uvc_buffer_prepare(struct vb2_buffer *vb)
 {
         struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue);
-        struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct uvc_buffer *buf = container_of(vbuf, struct uvc_buffer, buf);
 
-        if (vb->v4l2_buf.type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
+        if (vb->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
             vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0)) {
                 uvc_trace(UVC_TRACE_CAPTURE, "[E] Bytes used out of bounds.\n");
                 return -EINVAL;
@@ -75,7 +76,7 @@ static int uvc_buffer_prepare(struct vb2_buffer *vb)
         buf->state = UVC_BUF_STATE_QUEUED;
         buf->mem = vb2_plane_vaddr(vb, 0);
         buf->length = vb2_plane_size(vb, 0);
-        if (vb->v4l2_buf.type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+        if (vb->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 buf->bytesused = 0;
         else
                 buf->bytesused = vb2_get_plane_payload(vb, 0);
@@ -86,7 +87,8 @@ static int uvc_buffer_prepare(struct vb2_buffer *vb)
 static void uvc_buffer_queue(struct vb2_buffer *vb)
 {
         struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue);
-        struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf);
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
+        struct uvc_buffer *buf = container_of(vbuf, struct uvc_buffer, buf);
         unsigned long flags;
 
         spin_lock_irqsave(&queue->irqlock, flags);
@@ -98,7 +100,7 @@ static void uvc_buffer_queue(struct vb2_buffer *vb)
                  * directly. The next QBUF call will fail with -ENODEV.
                  */
                 buf->state = UVC_BUF_STATE_ERROR;
-                vb2_buffer_done(&buf->buf, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(vb, VB2_BUF_STATE_ERROR);
         }
 
         spin_unlock_irqrestore(&queue->irqlock, flags);
@@ -242,7 +244,7 @@ void uvcg_queue_cancel(struct uvc_video_queue *queue, int disconnect)
                                        queue);
                 list_del(&buf->queue);
                 buf->state = UVC_BUF_STATE_ERROR;
-                vb2_buffer_done(&buf->buf, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_ERROR);
         }
         /* This must be protected by the irqlock spinlock to avoid race
          * conditions between uvc_queue_buffer and the disconnection event that
@@ -314,7 +316,7 @@ struct uvc_buffer *uvcg_queue_next_buffer(struct uvc_video_queue *queue,
         if ((queue->flags & UVC_QUEUE_DROP_INCOMPLETE) &&
              buf->length != buf->bytesused) {
                 buf->state = UVC_BUF_STATE_QUEUED;
-                vb2_set_plane_payload(&buf->buf, 0, 0);
+                vb2_set_plane_payload(&buf->buf.vb2_buf, 0, 0);
                 return buf;
         }
 
@@ -325,12 +327,12 @@ struct uvc_buffer *uvcg_queue_next_buffer(struct uvc_video_queue *queue,
         else
                 nextbuf = NULL;
 
-        buf->buf.v4l2_buf.field = V4L2_FIELD_NONE;
-        buf->buf.v4l2_buf.sequence = queue->sequence++;
-        v4l2_get_timestamp(&buf->buf.v4l2_buf.timestamp);
+        buf->buf.field = V4L2_FIELD_NONE;
+        buf->buf.sequence = queue->sequence++;
+        v4l2_get_timestamp(&buf->buf.timestamp);
 
-        vb2_set_plane_payload(&buf->buf, 0, buf->bytesused);
-        vb2_buffer_done(&buf->buf, VB2_BUF_STATE_DONE);
+        vb2_set_plane_payload(&buf->buf.vb2_buf, 0, buf->bytesused);
+        vb2_buffer_done(&buf->buf.vb2_buf, VB2_BUF_STATE_DONE);
 
         return nextbuf;
 }