diff options
Diffstat (limited to 'drivers/media/video/omap3isp/ispstat.c')
-rw-r--r-- | drivers/media/video/omap3isp/ispstat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/omap3isp/ispstat.c b/drivers/media/video/omap3isp/ispstat.c index bc0b2c7349b..11871ecc6d2 100644 --- a/drivers/media/video/omap3isp/ispstat.c +++ b/drivers/media/video/omap3isp/ispstat.c | |||
@@ -366,7 +366,7 @@ static void isp_stat_bufs_free(struct ispstat *stat) | |||
366 | dma_unmap_sg(isp->dev, buf->iovm->sgt->sgl, | 366 | dma_unmap_sg(isp->dev, buf->iovm->sgt->sgl, |
367 | buf->iovm->sgt->nents, | 367 | buf->iovm->sgt->nents, |
368 | DMA_FROM_DEVICE); | 368 | DMA_FROM_DEVICE); |
369 | omap_iommu_vfree(isp->domain, isp->iommu, | 369 | omap_iommu_vfree(isp->domain, isp->dev, |
370 | buf->iommu_addr); | 370 | buf->iommu_addr); |
371 | } else { | 371 | } else { |
372 | if (!buf->virt_addr) | 372 | if (!buf->virt_addr) |
@@ -400,7 +400,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size) | |||
400 | struct iovm_struct *iovm; | 400 | struct iovm_struct *iovm; |
401 | 401 | ||
402 | WARN_ON(buf->dma_addr); | 402 | WARN_ON(buf->dma_addr); |
403 | buf->iommu_addr = omap_iommu_vmalloc(isp->domain, isp->iommu, 0, | 403 | buf->iommu_addr = omap_iommu_vmalloc(isp->domain, isp->dev, 0, |
404 | size, IOMMU_FLAG); | 404 | size, IOMMU_FLAG); |
405 | if (IS_ERR((void *)buf->iommu_addr)) { | 405 | if (IS_ERR((void *)buf->iommu_addr)) { |
406 | dev_err(stat->isp->dev, | 406 | dev_err(stat->isp->dev, |
@@ -410,7 +410,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size) | |||
410 | return -ENOMEM; | 410 | return -ENOMEM; |
411 | } | 411 | } |
412 | 412 | ||
413 | iovm = omap_find_iovm_area(isp->iommu, buf->iommu_addr); | 413 | iovm = omap_find_iovm_area(isp->dev, buf->iommu_addr); |
414 | if (!iovm || | 414 | if (!iovm || |
415 | !dma_map_sg(isp->dev, iovm->sgt->sgl, iovm->sgt->nents, | 415 | !dma_map_sg(isp->dev, iovm->sgt->sgl, iovm->sgt->nents, |
416 | DMA_FROM_DEVICE)) { | 416 | DMA_FROM_DEVICE)) { |
@@ -419,7 +419,7 @@ static int isp_stat_bufs_alloc_iommu(struct ispstat *stat, unsigned int size) | |||
419 | } | 419 | } |
420 | buf->iovm = iovm; | 420 | buf->iovm = iovm; |
421 | 421 | ||
422 | buf->virt_addr = omap_da_to_va(stat->isp->iommu, | 422 | buf->virt_addr = omap_da_to_va(stat->isp->dev, |
423 | (u32)buf->iommu_addr); | 423 | (u32)buf->iommu_addr); |
424 | buf->empty = 1; | 424 | buf->empty = 1; |
425 | dev_dbg(stat->isp->dev, "%s: buffer[%d] allocated." | 425 | dev_dbg(stat->isp->dev, "%s: buffer[%d] allocated." |