evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

drm/exynos: exynos_drm_ipp: fix return value check

Browse source 
In case of error, the function ipp_find_obj() 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>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
This commit is contained in:
Wei Yongjun 2013-07-04 21:35:00 +08:00 • committed by Inki Dae
parent bf903e4141
commit be348790e4
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/gpu/drm/exynos/exynos_drm_ipp.c
View file

@ -342,10 +342,10 @@ int exynos_drm_ipp_get_property(struct drm_device *drm_dev, void *data,
*/ */
ippdrv = ipp_find_obj(&ctx->ipp_idr, &ctx->ipp_lock, ippdrv = ipp_find_obj(&ctx->ipp_idr, &ctx->ipp_lock,
prop_list->ipp_id); prop_list->ipp_id);
if (!ippdrv) { if (IS_ERR(ippdrv)) {
DRM_ERROR("not found ipp%d driver.\n", DRM_ERROR("not found ipp%d driver.\n",
prop_list->ipp_id); prop_list->ipp_id);
return -EINVAL; return PTR_ERR(ippdrv);
} }
prop_list = ippdrv->prop_list; prop_list = ippdrv->prop_list;
@ -970,9 +970,9 @@ int exynos_drm_ipp_queue_buf(struct drm_device *drm_dev, void *data,
/* find command node */ /* find command node */
c_node = ipp_find_obj(&ctx->prop_idr, &ctx->prop_lock, c_node = ipp_find_obj(&ctx->prop_idr, &ctx->prop_lock,
qbuf->prop_id); qbuf->prop_id);
if (!c_node) { if (IS_ERR(c_node)) {
DRM_ERROR("failed to get command node.\n"); DRM_ERROR("failed to get command node.\n");
return -EFAULT; return PTR_ERR(c_node);
} }
/* buffer control */ /* buffer control */
@ -1106,9 +1106,9 @@ int exynos_drm_ipp_cmd_ctrl(struct drm_device *drm_dev, void *data,
c_node = ipp_find_obj(&ctx->prop_idr, &ctx->prop_lock, c_node = ipp_find_obj(&ctx->prop_idr, &ctx->prop_lock,
cmd_ctrl->prop_id); cmd_ctrl->prop_id);
if (!c_node) { if (IS_ERR(c_node)) {
DRM_ERROR("invalid command node list.\n"); DRM_ERROR("invalid command node list.\n");
return -EINVAL; return PTR_ERR(c_node);
} }
if (!exynos_drm_ipp_check_valid(ippdrv->dev, cmd_ctrl->ctrl, if (!exynos_drm_ipp_check_valid(ippdrv->dev, cmd_ctrl->ctrl,