From: Marek Szyprowski <m.szyprowski@samsung.com>
To: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-media@vger.kernel.org
Cc: Mauro Carvalho Chehab <mchehab@redhat.com>,
Greg Kroah-Hartman <gregkh@suse.de>,
Marin Mitov <mitov@issp.bas.bg>,
Marek Szyprowski <m.szyprowski@samsung.com>
Subject: [PATCH] staging: dt3155v4l: fix build break
Date: Thu, 22 Sep 2011 09:04:42 +0200 [thread overview]
Message-ID: <1316675082-9310-1-git-send-email-m.szyprowski@samsung.com> (raw)
In-Reply-To: <20110922131232.56210b544f587210621ae339@canb.auug.org.au>
This patch fixes build break caused by commit ba7fcb0c9549 ("[media] media: vb2: dma
contig allocator: use dma_addr instread of paddr").
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
drivers/staging/dt3155v4l/dt3155v4l.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/dt3155v4l/dt3155v4l.c b/drivers/staging/dt3155v4l/dt3155v4l.c
index 05aa41c..0ede5d1 100644
--- a/drivers/staging/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/dt3155v4l/dt3155v4l.c
@@ -207,7 +207,7 @@ dt3155_start_acq(struct dt3155_priv *pd)
struct vb2_buffer *vb = pd->curr_buf;
dma_addr_t dma_addr;
- dma_addr = vb2_dma_contig_plane_paddr(vb, 0);
+ dma_addr = vb2_dma_contig_plane_dma_addr(vb, 0);
iowrite32(dma_addr, pd->regs + EVEN_DMA_START);
iowrite32(dma_addr + img_width, pd->regs + ODD_DMA_START);
iowrite32(img_width, pd->regs + EVEN_DMA_STRIDE);
@@ -374,7 +374,7 @@ dt3155_irq_handler_even(int irq, void *dev_id)
ivb = list_first_entry(&ipd->dmaq, typeof(*ivb), done_entry);
list_del(&ivb->done_entry);
ipd->curr_buf = ivb;
- dma_addr = vb2_dma_contig_plane_paddr(ivb, 0);
+ dma_addr = vb2_dma_contig_plane_dma_addr(ivb, 0);
iowrite32(dma_addr, ipd->regs + EVEN_DMA_START);
iowrite32(dma_addr + img_width, ipd->regs + ODD_DMA_START);
iowrite32(img_width, ipd->regs + EVEN_DMA_STRIDE);
--
1.7.1.569.g6f426
next prev parent reply other threads:[~2011-09-22 7:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-22 3:12 linux-next: build failure after merge of the v4l-dvb tree Stephen Rothwell
2011-09-22 7:04 ` Marek Szyprowski [this message]
2011-09-22 12:46 ` Mauro Carvalho Chehab
2011-09-22 20:19 ` Greg KH
2011-09-23 14:27 ` Mauro Carvalho Chehab
2011-09-27 0:49 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1316675082-9310-1-git-send-email-m.szyprowski@samsung.com \
--to=m.szyprowski@samsung.com \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab@redhat.com \
--cc=mitov@issp.bas.bg \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).