Merge remote-tracking branch 'v4l-dvb/master'

[karo-tx-linux.git] / drivers / media / usb / pwc / pwc-uncompress.c

diff --git a/drivers/media/usb/pwc/pwc-uncompress.c b/drivers/media/usb/pwc/pwc-uncompress.c
index b65903fbcf0d536c4b309408e24e73a737fb66d5..98c46f93f119bd5d913837afe818098b847c7c56 100644 (file)
--- a/drivers/media/usb/pwc/pwc-uncompress.c
+++ b/drivers/media/usb/pwc/pwc-uncompress.c
@@ -40,7 +40,7 @@ int pwc_decompress(struct pwc_device *pdev, struct pwc_frame_buf *fbuf)
        u16 *src;
        u16 *dsty, *dstu, *dstv;
 
-       image = vb2_plane_vaddr(&fbuf->vb, 0);
+       image = vb2_plane_vaddr(&fbuf->vb.vb2_buf, 0);
 
        yuv = fbuf->data + pdev->frame_header_size;  /* Skip header */
 
@@ -55,12 +55,12 @@ int pwc_decompress(struct pwc_device *pdev, struct pwc_frame_buf *fbuf)
                         * determine this using the type of the webcam */
                memcpy(raw_frame->cmd, pdev->cmd_buf, 4);
                memcpy(raw_frame+1, yuv, pdev->frame_size);
-               vb2_set_plane_payload(&fbuf->vb, 0,
+               vb2_set_plane_payload(&fbuf->vb.vb2_buf, 0,
                        pdev->frame_size + sizeof(struct pwc_raw_frame));
                return 0;
        }
 
-       vb2_set_plane_payload(&fbuf->vb, 0,
+       vb2_set_plane_payload(&fbuf->vb.vb2_buf, 0,
                              pdev->width * pdev->height * 3 / 2);
 
        if (pdev->vbandlength == 0) {