diff mbox

media: fix a typo CONFIG_HAVE_GENERIC_DMA_COHERENT in videobuf2-dma-contig.c

Message ID CA+V-a8tm+bhnXNEtKHsgQWVUJy3m4k1DNzFvOQhuMk42FnqyAw@mail.gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Lad, Prabhakar Nov. 27, 2012, 7:31 a.m. UTC 
Hi,

On Tue, Nov 27, 2012 at 12:47 PM, Kyungmin Park
<kyungmin.park@samsung.com> wrote:
> Hi,
>
> Does it right to use CONFIG_HAVE_GENERIC_DMA_COHERENT?
> it defined at init/Kconfig
>
> config HAVE_GENERIC_DMA_COHERENT
>         bool
>         default n
> and use at C file or header file as CONFIG_ prefix?
> e.g., include/asm-generic/dma-coherent.h:#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
>
My Bad right fix should have been this:

------------------x-----------------------
        struct sg_table sgt;

Regards,
--Prabhakar

> Thank you,
> Kyungmin Park
>
> On 11/27/12, Prabhakar Lad <prabhakar.csengg@gmail.com> wrote:
>> From: Lad, Prabhakar <prabhakar.lad@ti.com>
>>
>> from commit 93049b9368a2e257ace66252ab2cc066f3399cad, which adds
>> a check HAVE_GENERIC_DMA_COHERENT for dma ops, the check was wrongly
>> made it should have been HAVE_GENERIC_DMA_COHERENT but it was
>> CONFIG_HAVE_GENERIC_DMA_COHERENT.
>> This patch fixes the typo, which was causing following build error:
>>
>> videobuf2-dma-contig.c:743: error: 'vb2_dc_get_dmabuf' undeclared here (not
>> in a function)
>> make[3]: *** [drivers/media/v4l2-core/videobuf2-dma-contig.o] Error 1
>>
>> Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
>> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
>> ---
>>  drivers/media/v4l2-core/videobuf2-dma-contig.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> index 5729450..dfea692 100644
>> --- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> +++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
>> @@ -739,7 +739,7 @@ static void *vb2_dc_attach_dmabuf(void *alloc_ctx,
>> struct dma_buf *dbuf,
>>  const struct vb2_mem_ops vb2_dma_contig_memops = {
>>       .alloc          = vb2_dc_alloc,
>>       .put            = vb2_dc_put,
>> -#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT
>> +#ifdef HAVE_GENERIC_DMA_COHERENT
>>       .get_dmabuf     = vb2_dc_get_dmabuf,
>>  #endif
>>       .cookie         = vb2_dc_cookie,
>> --
>> 1.7.0.4
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c
b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index 5729450..083b065 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -226,7 +226,7 @@  static int vb2_dc_mmap(void *buf_priv, struct
vm_area_struct *vma)
 /*         DMABUF ops for exporters          */
 /*********************************************/

-#ifdef HAVE_GENERIC_DMA_COHERENT
+#ifdef CONFIG_HAVE_GENERIC_DMA_COHERENT

 struct vb2_dc_attachment {