video: adf: fix memblock build failure
authorAmit Pundir <amit.pundir@linaro.org>
Wed, 1 Apr 2015 11:14:44 +0000 (16:44 +0530)
committerJohn Stultz <john.stultz@linaro.org>
Tue, 16 Feb 2016 21:53:24 +0000 (13:53 -0800)
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>
drivers/video/adf/adf_memblock.c

index e73a7d59f1e60fbd92bf05bbde13e535e1007ae1..ab583f838db2a446e8a31261b06b748755c27fc9 100644 (file)
@@ -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);