Merge branch 'next' into for-linus

[linux.git] / drivers / gpu / drm / omapdrm / omap_gem.c

diff --git a/drivers/gpu/drm/omapdrm/omap_gem.c b/drivers/gpu/drm/omapdrm/omap_gem.c
index 30d299ca8795d6a945287b2c335d88b77f1e671a..38af6195d95936c03aba364b12d31cb3d3c7adb5 100644 (file)
--- a/drivers/gpu/drm/omapdrm/omap_gem.c
+++ b/drivers/gpu/drm/omapdrm/omap_gem.c
@@ -1324,8 +1324,7 @@ struct drm_gem_object *omap_gem_new_dmabuf(struct drm_device *dev, size_t size,
                }
 
                omap_obj->pages = pages;
-               ret = drm_prime_sg_to_page_addr_arrays(sgt, pages, NULL,
-                                                      npages);
+               ret = drm_prime_sg_to_page_array(sgt, pages, npages);
                if (ret) {
                        omap_gem_free_object(obj);
                        obj = ERR_PTR(-ENOMEM);