summaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2011-09-22 08:44:57 +0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-09-23 20:08:46 +0200
commit1f28291c2cf41e1078e9d1306044e0d4bac41795 (patch)
treeff1dcb6c9b085fa3179f50f3ca02a841b9794234 /drivers/staging
parent[media] altera-stapl: it is time to move out from staging (diff)
downloadlinux-1f28291c2cf41e1078e9d1306044e0d4bac41795.tar.xz
linux-1f28291c2cf41e1078e9d1306044e0d4bac41795.zip
[media] staging: dt3155v4l: fix build break
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> Cc: Greg KH <greg@kroah.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/dt3155v4l/dt3155v4l.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/dt3155v4l/dt3155v4l.c b/drivers/staging/dt3155v4l/dt3155v4l.c
index 05aa41cf875b..0ede5d1e984b 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);