aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2011-09-06 10:03:26 -0400
committerJoerg Roedel <joerg.roedel@amd.com>2011-10-21 08:37:19 -0400
commit905d66c1e5dc8149e111f04a32bb193f25da1d53 (patch)
tree3b4d55034f1ca58a7956c88cb71f6af8cda2b697 /drivers/media
parentff21776d12ff7993a6b236b8273ef62777d25dfb (diff)
iommu/core: Add bus_type parameter to iommu_domain_alloc
This is necessary to store a pointer to the bus-specific iommu_ops in the iommu-domain structure. It will be used later to call into bus-specific iommu-ops. Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/omap3isp/isp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c
index a4baa6165c2c..a7ed98596883 100644
--- a/drivers/media/video/omap3isp/isp.c
+++ b/drivers/media/video/omap3isp/isp.c
@@ -2141,7 +2141,7 @@ static int isp_probe(struct platform_device *pdev)
2141 /* to be removed once iommu migration is complete */ 2141 /* to be removed once iommu migration is complete */
2142 isp->iommu = to_iommu(isp->iommu_dev); 2142 isp->iommu = to_iommu(isp->iommu_dev);
2143 2143
2144 isp->domain = iommu_domain_alloc(); 2144 isp->domain = iommu_domain_alloc(pdev->dev.bus);
2145 if (!isp->domain) { 2145 if (!isp->domain) {
2146 dev_err(isp->dev, "can't alloc iommu domain\n"); 2146 dev_err(isp->dev, "can't alloc iommu domain\n");
2147 ret = -ENOMEM; 2147 ret = -ENOMEM;