From: Wei Yongjun yongjun_wei@trendmicro.com.cn
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 --- drivers/gpu/drm/exynos/exynos_drm_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_iommu.c b/drivers/gpu/drm/exynos/exynos_drm_iommu.c index 09db198..3b3d3a6 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_iommu.c +++ b/drivers/gpu/drm/exynos/exynos_drm_iommu.c @@ -56,7 +56,7 @@ 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) + if (IS_ERR(mapping)) return -ENOMEM;
dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms),
Applied.
Thanks, Inki Dae
2012/12/7 Wei Yongjun weiyj.lk@gmail.com
From: Wei Yongjun yongjun_wei@trendmicro.com.cn
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
drivers/gpu/drm/exynos/exynos_drm_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_iommu.c b/drivers/gpu/drm/exynos/exynos_drm_iommu.c index 09db198..3b3d3a6 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_iommu.c +++ b/drivers/gpu/drm/exynos/exynos_drm_iommu.c @@ -56,7 +56,7 @@ 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)
if (IS_ERR(mapping)) return -ENOMEM; dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms),
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
On 2012년 12월 07일 21:50, Wei Yongjun wrote:
From: Wei Yongjun yongjun_wei@trendmicro.com.cn
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
drivers/gpu/drm/exynos/exynos_drm_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_iommu.c b/drivers/gpu/drm/exynos/exynos_drm_iommu.c index 09db198..3b3d3a6 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_iommu.c +++ b/drivers/gpu/drm/exynos/exynos_drm_iommu.c @@ -56,7 +56,7 @@ 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)
- if (IS_ERR(mapping)) return -ENOMEM;
One more fix is needed here. - return -ENOMEM; + return PTR_ERR(mapping);
dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms),
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
-----Original Message----- From: 김승우 [mailto:sw0312.kim@samsung.com] Sent: Monday, December 10, 2012 3:14 PM To: Wei Yongjun Cc: inki.dae@samsung.com; jy0922.shim@samsung.com; kyungmin.park@samsung.com; airlied@linux.ie; yongjun_wei@trendmicro.com.cn; linux-kernel@vger.kernel.org; dri-devel@lists.freedesktop.org; sw0312.kim@samsung.com Subject: Re: [PATCH -next] drm/exynos/iommu: fix return value check in drm_create_iommu_mapping()
On 2012년 12월 07일 21:50, Wei Yongjun wrote:
From: Wei Yongjun yongjun_wei@trendmicro.com.cn
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
drivers/gpu/drm/exynos/exynos_drm_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/exynos/exynos_drm_iommu.c
b/drivers/gpu/drm/exynos/exynos_drm_iommu.c
index 09db198..3b3d3a6 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_iommu.c +++ b/drivers/gpu/drm/exynos/exynos_drm_iommu.c @@ -56,7 +56,7 @@ 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)
- if (IS_ERR(mapping)) return -ENOMEM;
One more fix is needed here.
return -ENOMEM;
return PTR_ERR(mapping);
Oh, good point, I missed. Please re-send it.
Thanks, Inki Dae
dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms),
dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel
-- Seung-Woo Kim Samsung Software R&D Center --
dri-devel@lists.freedesktop.org
-
Inki Dae -
Wei Yongjun -
김승우