aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/omap3isp/ispccdc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/omap3isp/ispccdc.c')
-rw-r--r--drivers/media/video/omap3isp/ispccdc.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/omap3isp/ispccdc.c b/drivers/media/video/omap3isp/ispccdc.c
index 9d3459de04b2..de2547413739 100644
--- a/drivers/media/video/omap3isp/ispccdc.c
+++ b/drivers/media/video/omap3isp/ispccdc.c
@@ -365,7 +365,7 @@ static void ccdc_lsc_free_request(struct isp_ccdc_device *ccdc,
365 dma_unmap_sg(isp->dev, req->iovm->sgt->sgl, 365 dma_unmap_sg(isp->dev, req->iovm->sgt->sgl,
366 req->iovm->sgt->nents, DMA_TO_DEVICE); 366 req->iovm->sgt->nents, DMA_TO_DEVICE);
367 if (req->table) 367 if (req->table)
368 iommu_vfree(isp->iommu, req->table); 368 iommu_vfree(isp->domain, isp->iommu, req->table);
369 kfree(req); 369 kfree(req);
370} 370}
371 371
@@ -437,8 +437,8 @@ static int ccdc_lsc_config(struct isp_ccdc_device *ccdc,
437 437
438 req->enable = 1; 438 req->enable = 1;
439 439
440 req->table = iommu_vmalloc(isp->iommu, 0, req->config.size, 440 req->table = iommu_vmalloc(isp->domain, isp->iommu, 0,
441 IOMMU_FLAG); 441 req->config.size, IOMMU_FLAG);
442 if (IS_ERR_VALUE(req->table)) { 442 if (IS_ERR_VALUE(req->table)) {
443 req->table = 0; 443 req->table = 0;
444 ret = -ENOMEM; 444 ret = -ENOMEM;
@@ -733,15 +733,15 @@ static int ccdc_config(struct isp_ccdc_device *ccdc,
733 * already done by iommu_vmalloc(). 733 * already done by iommu_vmalloc().
734 */ 734 */
735 size = ccdc->fpc.fpnum * 4; 735 size = ccdc->fpc.fpnum * 4;
736 table_new = iommu_vmalloc(isp->iommu, 0, size, 736 table_new = iommu_vmalloc(isp->domain, isp->iommu, 0,
737 IOMMU_FLAG); 737 size, IOMMU_FLAG);
738 if (IS_ERR_VALUE(table_new)) 738 if (IS_ERR_VALUE(table_new))
739 return -ENOMEM; 739 return -ENOMEM;
740 740
741 if (copy_from_user(da_to_va(isp->iommu, table_new), 741 if (copy_from_user(da_to_va(isp->iommu, table_new),
742 (__force void __user *) 742 (__force void __user *)
743 ccdc->fpc.fpcaddr, size)) { 743 ccdc->fpc.fpcaddr, size)) {
744 iommu_vfree(isp->iommu, table_new); 744 iommu_vfree(isp->domain, isp->iommu, table_new);
745 return -EFAULT; 745 return -EFAULT;
746 } 746 }
747 747
@@ -751,7 +751,7 @@ static int ccdc_config(struct isp_ccdc_device *ccdc,
751 751
752 ccdc_configure_fpc(ccdc); 752 ccdc_configure_fpc(ccdc);
753 if (table_old != 0) 753 if (table_old != 0)
754 iommu_vfree(isp->iommu, table_old); 754 iommu_vfree(isp->domain, isp->iommu, table_old);
755 } 755 }
756 756
757 return ccdc_lsc_config(ccdc, ccdc_struct); 757 return ccdc_lsc_config(ccdc, ccdc_struct);
@@ -2286,5 +2286,5 @@ void omap3isp_ccdc_cleanup(struct isp_device *isp)
2286 ccdc_lsc_free_queue(ccdc, &ccdc->lsc.free_queue); 2286 ccdc_lsc_free_queue(ccdc, &ccdc->lsc.free_queue);
2287 2287
2288 if (ccdc->fpc.fpcaddr != 0) 2288 if (ccdc->fpc.fpcaddr != 0)
2289 iommu_vfree(isp->iommu, ccdc->fpc.fpcaddr); 2289 iommu_vfree(isp->domain, isp->iommu, ccdc->fpc.fpcaddr);
2290} 2290}