Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S946146AbcJSQSW (ORCPT ); Wed, 19 Oct 2016 12:18:22 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:34886 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941476AbcJSQST (ORCPT ); Wed, 19 Oct 2016 12:18:19 -0400 From: Wei Yongjun To: Daniel Vetter , Jani Nikula , David Airlie , Yulei Zhang , Zhenyu Wang , Zhi Wang Cc: Wei Yongjun , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH -next] drm/i915/gvt: fix return value check Date: Wed, 19 Oct 2016 16:18:03 +0000 Message-Id: <1476893883-8096-1-git-send-email-weiyj.lk@gmail.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1360 Lines: 37 From: Wei Yongjun In case of error, the function i915_gem_object_create() returns ERR_PTR() not NULL. The NULL test in the return value check should be replaced with IS_ERR(). Signed-off-by: Wei Yongjun --- drivers/gpu/drm/i915/gvt/cmd_parser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 5808ee7..6abb2a6 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -1640,8 +1640,8 @@ static int perform_bb_shadow(struct parser_exec_state *s) entry_obj->obj = i915_gem_object_create(&(s->vgpu->gvt->dev_priv->drm), round_up(bb_size, PAGE_SIZE)); - if (entry_obj->obj == NULL) - return -ENOMEM; + if (IS_ERR(entry_obj->obj)) + return PTR_ERR(entry_obj->obj); entry_obj->len = bb_size; INIT_LIST_HEAD(&entry_obj->list); @@ -2712,8 +2712,8 @@ static int shadow_indirect_ctx(struct intel_shadow_wa_ctx *wa_ctx) wa_ctx->indirect_ctx.obj = i915_gem_object_create(dev, round_up(ctx_size + CACHELINE_BYTES, PAGE_SIZE)); - if (wa_ctx->indirect_ctx.obj == NULL) - return -ENOMEM; + if (IS_ERR(wa_ctx->indirect_ctx.obj)) + return PTR_ERR(wa_ctx->indirect_ctx.obj); ret = i915_gem_object_get_pages(wa_ctx->indirect_ctx.obj); if (ret)