From 19c7012bf9dc12bb557aa11d825b3d7b631ea70c Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 1 May 2013 14:23:41 +1000 Subject: [PATCH] --- yaml --- r: 371639 b: refs/heads/master c: b11b88ef0e07a1ea9a3df6666ba8e15833facc67 h: refs/heads/master i: 371637: e9dd4d097316dd3bdbd06645e2de258ce2fec530 371635: 2dbf36b381bbdef209b60f60802432efb89cf27f 371631: b20361563d90d6b1d323e060116d5f4431e4613c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_gem_dmabuf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 204423d23ad9..fa6d6f33d72f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98b76231d7ef49c71c7fea354f00c619ab2c1be4 +refs/heads/master: b11b88ef0e07a1ea9a3df6666ba8e15833facc67 diff --git a/trunk/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/trunk/drivers/gpu/drm/i915/i915_gem_dmabuf.c index 30485e9efcb7..dc53a527126b 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem_dmabuf.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -129,7 +129,7 @@ static void *i915_gem_dmabuf_vmap(struct dma_buf *dma_buf) goto error; i = 0; - for_each_sg_page(obj->pages->sgl, &sg_iter, obj->pages->nents, 0); + for_each_sg_page(obj->pages->sgl, &sg_iter, obj->pages->nents, 0) pages[i++] = sg_page_iter_page(&sg_iter); obj->dma_buf_vmapping = vmap(pages, i, 0, PAGE_KERNEL);