Skip to content

Commit

Permalink
drm/exynos: exynos_drm_ipp: fix return value check
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wei Yongjun authored and Inki Dae committed Jul 29, 2013
1 parent bf903e4 commit be34879
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/gpu/drm/exynos/exynos_drm_ipp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
prop_list->ipp_id);
if (!ippdrv) {
if (IS_ERR(ippdrv)) {
DRM_ERROR("not found ipp%d driver.\n",
prop_list->ipp_id);
return -EINVAL;
return PTR_ERR(ippdrv);
}

prop_list = ippdrv->prop_list;
Expand Down Expand Up @@ -970,9 +970,9 @@ int exynos_drm_ipp_queue_buf(struct drm_device *drm_dev, void *data,
/* find command node */
c_node = ipp_find_obj(&ctx->prop_idr, &ctx->prop_lock,
qbuf->prop_id);
if (!c_node) {
if (IS_ERR(c_node)) {
DRM_ERROR("failed to get command node.\n");
return -EFAULT;
return PTR_ERR(c_node);
}

/* buffer control */
Expand Down Expand Up @@ -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,
cmd_ctrl->prop_id);
if (!c_node) {
if (IS_ERR(c_node)) {
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,
Expand Down

0 comments on commit be34879

Please sign in to comment.