From patchwork Fri Mar 17 20:53:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9631583 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0258B60249 for ; Fri, 17 Mar 2017 20:53:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8D8728464 for ; Fri, 17 Mar 2017 20:53:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DD51E285D4; Fri, 17 Mar 2017 20:53:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7E90F28464 for ; Fri, 17 Mar 2017 20:53:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 092F56EDB5; Fri, 17 Mar 2017 20:53:23 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 81E816EDB5 for ; Fri, 17 Mar 2017 20:53:21 +0000 (UTC) Received: by mail-wr0-x242.google.com with SMTP id u48so10887709wrc.1 for ; Fri, 17 Mar 2017 13:53:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=R4o7GhbRrDVLqgy374pvXxvn/kk3Ba95YcsRr3psqP8=; b=MJq52wHVweyg27NAVcjWW19a2C3etrcgXBP3E7WNWihma2GDFotQedsQbk5pGBlVmF dQi7KvfcA4Jv716cWrJX2TdYmvKohpt5a9vLuphKfnvxz2j6+/Li2NVoTocJmqo8cCoS qxcUS4hL0lTRvjCXBPcLLyh7lhVm/nPcWdi3RRhXTXKj6fbELijbPltz3yBtDQQLibr/ Xwj+qR1qJ1C/E63k17FJoBEGQFpSmT5kaYwKe1Mh4n/8XodQ/vEMqIWY6lyRy3z9QFlI qzkjJckF2DXxEgVshdR2C+tseFlvszJqpTn7f4luMA4GZyCtKwHZrJBpT6zltRO9WfT5 o0hw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=R4o7GhbRrDVLqgy374pvXxvn/kk3Ba95YcsRr3psqP8=; b=VJx+qGfcvKLWYjv1CuFLJKOvJ1Jr3rQcfMOCCQpP1luIZZFTj2g2pJS1OTJemWZ8lZ WmY8Rolam8/ZrzQbHORTP2kfyfsfVagTXgCr5AxC2ZQw+Y1WDQ5zdd3R71z9ONDFw7IA wi4AbIFSmDJz5GNh+AqKdmebNxqlrK+XnyhxLU+hG8kNf7gt05mE4hhJWCS7vLlfwBnX Xquqx8mhoALwnW+k1/6vfduSHvfpjUyXjg3J5Szlyr+iJHP5bb+tfA4D1CH/Hs7FuyBp 4oYzw3IF7Bl4aCm+55L+F3lKIQlyIIUtxKGzVvFCLF2cU1W/0kkqqVHqPfbN95gREcGY NWXw== X-Gm-Message-State: AFeK/H2Dw8NRA/oSC0YfyCXc0RFHabxenSxi+Omuef/rDnJvE4RT4VzOJ5y2wmEcyindNw== X-Received: by 10.223.169.45 with SMTP id u42mr14085073wrc.187.1489784000039; Fri, 17 Mar 2017 13:53:20 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id k128sm3912537wmf.16.2017.03.17.13.53.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2017 13:53:19 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 17 Mar 2017 20:53:17 +0000 Message-Id: <20170317205317.7885-1-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 Subject: [Intel-gfx] [PATCH] drm/i915: Correct error handling for i915_gem_object_create_from_data() X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP i915_gem_object_create_from_data() always returns and error pointer on failure, there is no need to check against NULL. Signed-off-by: Chris Wilson Reviewed-by: Matthew Auld --- drivers/gpu/drm/i915/intel_uc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c index 86530c92337a..d15a7d9d4eb0 100644 --- a/drivers/gpu/drm/i915/intel_uc.c +++ b/drivers/gpu/drm/i915/intel_uc.c @@ -377,8 +377,8 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv, uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted); obj = i915_gem_object_create_from_data(dev_priv, fw->data, fw->size); - if (IS_ERR_OR_NULL(obj)) { - err = obj ? PTR_ERR(obj) : -ENOMEM; + if (IS_ERR(obj)) { + err = PTR_ERR(obj); goto fail; }