Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma

[sfrench/cifs-2.6.git] / drivers / media / pci / intel / ipu3 / ipu3-cio2.c

diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
index 617fb2e944dc3c4ef0126a80377b69bb7d1351bb..f8020ebe9f05e8219f66c90b2b964f6ddd22aab1 100644 (file)
--- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c
+++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
@@ -846,7 +846,7 @@ static int cio2_vb2_buf_init(struct vb2_buffer *vb)
        unsigned int pages = DIV_ROUND_UP(vb->planes[0].length, CIO2_PAGE_SIZE);
        unsigned int lops = DIV_ROUND_UP(pages + 1, entries_per_page);
        struct sg_table *sg;
-       struct sg_page_iter sg_iter;
+       struct sg_dma_page_iter sg_iter;
        int i, j;
 
        if (lops <= 0 || lops > CIO2_MAX_LOPS) {
@@ -873,7 +873,7 @@ static int cio2_vb2_buf_init(struct vb2_buffer *vb)
                b->offset = sg->sgl->offset;
 
        i = j = 0;
-       for_each_sg_page(sg->sgl, &sg_iter, sg->nents, 0) {
+       for_each_sg_dma_page (sg->sgl, &sg_iter, sg->nents, 0) {
                if (!pages--)
                        break;
                b->lop[i][j] = sg_page_iter_dma_address(&sg_iter) >> PAGE_SHIFT;