Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933039Ab2K0Hjz (ORCPT ); Tue, 27 Nov 2012 02:39:55 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:54955 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757559Ab2K0Hjx (ORCPT ); Tue, 27 Nov 2012 02:39:53 -0500 MIME-Version: 1.0 In-Reply-To: <50B46A83.8020703@samsung.com> References: <1353995979-28792-1-git-send-email-prabhakar.lad@ti.com> <50B46A83.8020703@samsung.com> From: Prabhakar Lad Date: Tue, 27 Nov 2012 13:09:32 +0530 Message-ID: Subject: Re: [PATCH] media: fix a typo CONFIG_HAVE_GENERIC_DMA_COHERENT in videobuf2-dma-contig.c To: Marek Szyprowski Cc: LMML , LKML , Mauro Carvalho Chehab , Kyungmin Park , Pawel Osciak , "Lad, Prabhakar" , Manjunath Hadli Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2419 Lines: 69 Hi Marek, On Tue, Nov 27, 2012 at 12:53 PM, Marek Szyprowski wrote: > Hello, > > > On 11/27/2012 6:59 AM, Prabhakar Lad wrote: >> >> From: Lad, Prabhakar >> >> 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 >> Signed-off-by: Manjunath Hadli > > > The CONFIG_HAVE_GENERIC_DMA_COHERENT based patch was a quick workaround > for the build problem in linux-next and should be reverted now. The > correct patch has been posted for drivers/base/dma-mapping.c to LKML, > see http://www.spinics.net/lists/linux-next/msg22890.html > I was referring to this patch from Mauro, http://git.linuxtv.org/media_tree.git/commitdiff/93049b9368a2e257ace66252ab2cc066f3399cad which introduced this build error. Regards, --Prabhakar Lad > >> --- >> 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, > > > Best regards > -- > Marek Szyprowski > Samsung Poland R&D Center > > -- 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/