From patchwork Fri Mar 17 22:57:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 9631719 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 3C74C602D6 for ; Fri, 17 Mar 2017 22:58:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2872E2756B for ; Fri, 17 Mar 2017 22:58:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1CF6128593; Fri, 17 Mar 2017 22:58:00 +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 D4BBD2756B for ; Fri, 17 Mar 2017 22:57:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D2E4B6EDD5; Fri, 17 Mar 2017 22:57:58 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 280B289F07 for ; Fri, 17 Mar 2017 22:57:56 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id n11so5383944wma.0 for ; Fri, 17 Mar 2017 15:57:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=gmXJ0UuOOrAycsXqquyW2uTfRsls72+BNZiRnuUgA9c=; b=CaSVqvjzaNuTr8DCuCQnKOApX8ajYv47IKM9l73p0RcupQTgpnQwcwe8duEOEicMFY 9GeT1BpLcT/rpIl35ZTakwHYYYmv5kOqF7P505KYOxQ3mTpO5BSH1KvG0FWYnwHp55o6 FFAh9ozh42w8vObNunRqtqZyUyCRyG0eKUUP+sisxfVuMCdPqp6kX5EzUEKS9sMiGFSx fY+wrbf97T98uUR5gXoH6Lne1QEdI85LnZaDKs4wyW5rOpKOMwRBtB+l1BtwQe+5F8UI QkvukaL+E2RYHYF+8o/BwiZv5iqu5WtrXHwRQ2HU4Q5WGSZgzGwiUtqgUziN58vZ/nti 5GvQ== 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:subject:date:message-id :in-reply-to:references; bh=gmXJ0UuOOrAycsXqquyW2uTfRsls72+BNZiRnuUgA9c=; b=Hwq+arH5vG+HL0EA72xJn9EvE4Ch0+qBQUr64c7AHO/Cq/LTptJ4kTuP527z6kcLTr UusqxL0saZoT3sLqtjti/ZsaZ91vJbpqidvfMW8bZBaqVUnE36F3/jfSea3NL7jGT/bW ompKRjETmXonEs3zdZc2hHBH+bMqOq/4T6BTXsd4Q+8IeOxAQZqKSIvTrzM+bjEh+HHs j81lyTMdu0a0j34agMM8igeCAHZn4wMB4LzsJiGAOv0ZT92XGQhUUQHs774vOxqU/29x 6Fiqf9uWqZfKCSQXOorIZeO0gHa+3l5alCKwoXRdkNHvmNL6i4QcnQ7OLtENfotFQPIM S6bw== X-Gm-Message-State: AFeK/H3ruchqqifJ/6Z9oZE9/4FMohMcXqBZldNmXrZg4uWgSsAgjfbicqqWLdnI00LMwA== X-Received: by 10.28.131.77 with SMTP id f74mr403271wmd.109.1489791474589; Fri, 17 Mar 2017 15:57:54 -0700 (PDT) Received: from haswell.alporthouse.com ([78.156.65.138]) by smtp.gmail.com with ESMTPSA id o143sm4227780wmd.3.2017.03.17.15.57.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 17 Mar 2017 15:57:54 -0700 (PDT) From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 17 Mar 2017 22:57:50 +0000 Message-Id: <20170317225752.11014-2-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170317225752.11014-1-chris@chris-wilson.co.uk> References: <20170317225752.11014-1-chris@chris-wilson.co.uk> Subject: [Intel-gfx] [CI 2/4] 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 an error pointer on failure, there is no need to check against NULL. Signed-off-by: Chris Wilson Link: http://patchwork.freedesktop.org/patch/msgid/20170317205317.7885-1-chris@chris-wilson.co.uk 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; }