From patchwork Wed Jun 22 07:46:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [maverick, v2] UBUNTU: SAUCE: cx23885: Fix argument to videobuf_dma_unmap Date: Tue, 21 Jun 2011 21:46:15 -0000 From: Jeremy Kerr X-Patchwork-Id: 101401 Message-Id: <1308728775.775437.222234189762.1.gpush@pororo> To: kernel-team@lists.ubuntu.com Cc: Mario Limonciello BugLink: https://bugs.launchpad.net/bugs/800527 The commit bcbfc24 introduced a change to cx23885-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 Acked-by: Stefan Bader Acked-by: Andy Whitcroft --- v2: fix buglink & clarify title --- 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;