aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-12-10 02:11:13 -0500
committerInki Dae <daeinki@gmail.com>2012-12-13 09:05:45 -0500
commita0e41b562b3e302b47f887056d89189b816ce219 (patch)
treecf828e38c0ebe71b05d440b40c8a3bb5552459e4 /drivers/gpu
parentddd8e9594a2fc2b5bff40308483ec16a88e295ff (diff)
drm/exynos/iommu: fix return value check in drm_create_iommu_mapping()
In case of error, function arm_iommu_create_mapping() returns ERR_PTR() and never returns NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/exynos/exynos_drm_iommu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_drm_iommu.c b/drivers/gpu/drm/exynos/exynos_drm_iommu.c
index 09db1983eb1..2482b7f9634 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_iommu.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_iommu.c
@@ -56,8 +56,8 @@ int drm_create_iommu_mapping(struct drm_device *drm_dev)
56 mapping = arm_iommu_create_mapping(&platform_bus_type, priv->da_start, 56 mapping = arm_iommu_create_mapping(&platform_bus_type, priv->da_start,
57 priv->da_space_size, 57 priv->da_space_size,
58 priv->da_space_order); 58 priv->da_space_order);
59 if (!mapping) 59 if (IS_ERR(mapping))
60 return -ENOMEM; 60 return PTR_ERR(mapping);
61 61
62 dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms), 62 dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms),
63 GFP_KERNEL); 63 GFP_KERNEL);