1 files changed, 13 insertions, 9 deletions

diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c
index fd1fa412e094..e1d4d16ade05 100644
--- a/drivers/media/usb/hackrf/hackrf.c
+++ b/drivers/media/usb/hackrf/hackrf.c
@@ -21,6 +21,7 @@
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-event.h>
+#include <media/videobuf2-v4l2.h>
 #include <media/videobuf2-vmalloc.h>
 
 /* HackRF USB API commands (from HackRF Library) */
@@ -85,7 +86,8 @@ static const unsigned int NUM_FORMATS = ARRAY_SIZE(formats);
 
 /* intermediate buffers with raw data from the USB device */
 struct hackrf_frame_buf {
-        struct vb2_buffer vb;   /* common v4l buffer stuff -- must be first */
+        /* common v4l buffer stuff -- must be first */
+        struct vb2_v4l2_buffer vb;
         struct list_head list;
 };
 
@@ -287,13 +289,13 @@ static void hackrf_urb_complete(struct urb *urb)
                 }
 
                 /* fill framebuffer */
-                ptr = vb2_plane_vaddr(&fbuf->vb, 0);
+                ptr = vb2_plane_vaddr(&fbuf->vb.vb2_buf, 0);
                 len = hackrf_convert_stream(dev, ptr, urb->transfer_buffer,
                                 urb->actual_length);
-                vb2_set_plane_payload(&fbuf->vb, 0, len);
-                v4l2_get_timestamp(&fbuf->vb.v4l2_buf.timestamp);
-                fbuf->vb.v4l2_buf.sequence = dev->sequence++;
-                vb2_buffer_done(&fbuf->vb, VB2_BUF_STATE_DONE);
+                vb2_set_plane_payload(&fbuf->vb.vb2_buf, 0, len);
+                v4l2_get_timestamp(&fbuf->vb.timestamp);
+                fbuf->vb.sequence = dev->sequence++;
+                vb2_buffer_done(&fbuf->vb.vb2_buf, VB2_BUF_STATE_DONE);
         }
 skip:
         usb_submit_urb(urb, GFP_ATOMIC);
@@ -437,7 +439,7 @@ static void hackrf_cleanup_queued_bufs(struct hackrf_dev *dev)
                 buf = list_entry(dev->queued_bufs.next,
                                 struct hackrf_frame_buf, list);
                 list_del(&buf->list);
-                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+                vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR);
         }
         spin_unlock_irqrestore(&dev->queued_bufs_lock, flags);
 }
@@ -483,9 +485,10 @@ static int hackrf_queue_setup(struct vb2_queue *vq,
 
 static void hackrf_buf_queue(struct vb2_buffer *vb)
 {
+        struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
         struct hackrf_dev *dev = vb2_get_drv_priv(vb->vb2_queue);
         struct hackrf_frame_buf *buf =
-                        container_of(vb, struct hackrf_frame_buf, vb);
+                        container_of(vbuf, struct hackrf_frame_buf, vb);
         unsigned long flags;
 
         spin_lock_irqsave(&dev->queued_bufs_lock, flags);
@@ -539,7 +542,8 @@ err:
 
                 list_for_each_entry_safe(buf, tmp, &dev->queued_bufs, list) {
                         list_del(&buf->list);
-                        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+                        vb2_buffer_done(&buf->vb.vb2_buf,
+                                        VB2_BUF_STATE_QUEUED);
                 }
         }