From 3319c39cf1af88ae39b405be2f0132af1e633b48 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 10 Dec 2012 02:11:13 -0500 Subject: [PATCH] --- yaml --- r: 345617 b: refs/heads/master c: a0e41b562b3e302b47f887056d89189b816ce219 h: refs/heads/master i: 345615: 7a752a9a120409add6cf5d044fcf87aa1adc4b2e v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/exynos/exynos_drm_iommu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aedae631f540..51de5b2d4f1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddd8e9594a2fc2b5bff40308483ec16a88e295ff +refs/heads/master: a0e41b562b3e302b47f887056d89189b816ce219 diff --git a/trunk/drivers/gpu/drm/exynos/exynos_drm_iommu.c b/trunk/drivers/gpu/drm/exynos/exynos_drm_iommu.c index 09db1983eb1a..2482b7f96341 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_drm_iommu.c +++ b/trunk/drivers/gpu/drm/exynos/exynos_drm_iommu.c @@ -56,8 +56,8 @@ int drm_create_iommu_mapping(struct drm_device *drm_dev) mapping = arm_iommu_create_mapping(&platform_bus_type, priv->da_start, priv->da_space_size, priv->da_space_order); - if (!mapping) - return -ENOMEM; + if (IS_ERR(mapping)) + return PTR_ERR(mapping); dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms), GFP_KERNEL);