From patchwork Wed Jun 22 07:28:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 101399 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 9B492B6F8C for ; Wed, 22 Jun 2011 17:30:05 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QZHsm-0002fy-AD; Wed, 22 Jun 2011 07:29:52 +0000 Received: from ozlabs.org ([203.10.76.45]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QZHsj-0002fo-AX for kernel-team@lists.ubuntu.com; Wed, 22 Jun 2011 07:29:49 +0000 Received: by ozlabs.org (Postfix, from userid 1023) id 4B1DBB6F95; Wed, 22 Jun 2011 17:29:47 +1000 (EST) MIME-Version: 1.0 Subject: [PATCH maverick] UBUNTU: SAUCE: Fix argument to videobuf_dma_unmap Message-Id: <1308727720.8526.617194662030.1.gpush@pororo> To: kernel-team@lists.ubuntu.com From: Jeremy Kerr Date: Wed, 22 Jun 2011 15:28:39 +0800 Cc: Mario Limonciello X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: https://bugs.launchpad.net/800527 The commit bcbfc24 introduced a change to cx2388-core.c that is incorrect - the videobuf_dma_unmap function accepts a struct videobuf *, and bcbfc24 changed this to a struct device *. [The videobuf_dma_unmap API has been changed, but that new API is not in maverick] This change reverts the call to use the correct struct videobuf *. Signed-off-by: Jeremy Kerr --- drivers/media/video/cx23885/cx23885-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c index 7e897de..b3568df 100644 --- a/drivers/media/video/cx23885/cx23885-core.c +++ b/drivers/media/video/cx23885/cx23885-core.c @@ -1143,7 +1143,7 @@ void cx23885_free_buffer(struct videobuf_queue *q, struct cx23885_buffer *buf) BUG_ON(in_interrupt()); videobuf_waiton(&buf->vb, 0, 0); - videobuf_dma_unmap(q->dev, dma); + videobuf_dma_unmap(q, dma); videobuf_dma_free(dma); btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc); buf->vb.state = VIDEOBUF_NEEDS_INIT;