From 447839e431d53d7858ac33703640bfaab8726e63 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski Date: Thu, 22 Sep 2011 03:44:57 -0300 Subject: [PATCH] --- yaml --- r: 271885 b: refs/heads/master c: 1f28291c2cf41e1078e9d1306044e0d4bac41795 h: refs/heads/master i: 271883: 2330e905e1ae99977f0ba2d3984bcb8bf7f1528a v: v3 --- [refs] | 2 +- trunk/drivers/staging/dt3155v4l/dt3155v4l.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d1edecfb74e2..a84f7e2be533 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cff4fa8415a3224a5abdd2b1dd7f431e4ea49366 +refs/heads/master: 1f28291c2cf41e1078e9d1306044e0d4bac41795 diff --git a/trunk/drivers/staging/dt3155v4l/dt3155v4l.c b/trunk/drivers/staging/dt3155v4l/dt3155v4l.c index 05aa41cf875b..0ede5d1e984b 100644 --- a/trunk/drivers/staging/dt3155v4l/dt3155v4l.c +++ b/trunk/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);