From: Amit Pundir <amit.pundir@linaro.org>
Date: Wed, 1 Apr 2015 11:14:44 +0000 (+0530)
Subject: video: adf: fix memblock build failure
X-Git-Tag: firefly_0821_release~2958^2~207
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=aaec4221bce2e926315fb71301a2a83f7149c8ad;p=firefly-linux-kernel-4.4.55.git

video: adf: fix memblock build failure

Pass 'NULL' as the 5th argument to dma_buf_export() to fix
the following build failure:
----------
  CC      drivers/video/adf/adf_memblock.o
drivers/video/adf/adf_memblock.c: In function ‘adf_memblock_export’:
drivers/video/adf/adf_memblock.c:154:60: error: macro "dma_buf_export" requires 5 arguments, but only 4 given
drivers/video/adf/adf_memblock.c:154:8: error: ‘dma_buf_export’ undeclared (first use in this function)
drivers/video/adf/adf_memblock.c:154:8: note: each undeclared identifier is reported only once for each function it appears in
make[3]: *** [drivers/video/adf/adf_memblock.o] Error 1
make[2]: *** [drivers/video/adf] Error 2
----------

5th argument to dma_buf_export() is a pointer to 'reservation-object'
and a new 'reservation-object' is allocated in case 'NULL' is passed.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
---

diff --git a/drivers/video/adf/adf_memblock.c b/drivers/video/adf/adf_memblock.c
index e73a7d59f1e6..ab583f838db2 100644
--- a/drivers/video/adf/adf_memblock.c
+++ b/drivers/video/adf/adf_memblock.c
@@ -151,7 +151,7 @@ struct dma_buf *adf_memblock_export(phys_addr_t base, size_t size, int flags)
 		return ERR_PTR(-ENOMEM);
 
 	pdata->base = base;
-	buf = dma_buf_export(pdata, &adf_memblock_ops, size, flags);
+	buf = dma_buf_export(pdata, &adf_memblock_ops, size, flags, NULL);
 	if (IS_ERR(buf))
 		kfree(pdata);