Received: by 2002:a25:e7d8:0:0:0:0:0 with SMTP id e207csp661374ybh; Tue, 10 Mar 2020 06:04:55 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtjHgVt5Qx7d9/gYhv0lp5J4UVI+n9q6pFfRzuJRm9QdAVh26PdnI3cMFKvd61n3rLTBBuH X-Received: by 2002:a05:6808:614:: with SMTP id y20mr986459oih.64.1583845494898; Tue, 10 Mar 2020 06:04:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1583845494; cv=none; d=google.com; s=arc-20160816; b=EgNLevzYr/Op42RSeAUb8XNvjh1xi1Ja2GlOLggxgblCgCJbMD3+c75B58iUqy4sd3 p0zxFGF3Ij2iIzI6OxiqBHn9eNHxCgL1SuI3CMrlwPazzSdKebPYQFZ/4bbTnuizCE/W J1t83fzaZ+iLa6cO5+2MsGA116tACWO2U/3pZNhcpecopxpu47P6LK+ROP1+KjKM1pcL /5CVcrsTlzC4Lcis6mGf7OR8kHar1OkIYy0qtptY2DeaD8pDyck5yxLTt93s0iNZuOsp AXrkUrANDNWxAGG8jQtja6CRbSb9jiX1FK0YWTkSTP8HuiexG4ESHSJhb8s8uKPeTVpZ dUsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FXAi6EQ4xFXy5rmYpZQVLifaPXEo8IGXkRwbk+NfS80=; b=wbf0NijL1WoelGdDezVCsrPv6euFrhxar7xAdLbAiKO1/vG9Dfuq6wSwKAMbm6/pwZ +UCCJxDzuzzRN9ekGyymE/oPze4Unmjd4qOsQXNRmtx6X0h3E/hXq8iNDS9oOAw6VWzc qxQCd5HAB4u7DaPJXMQm3Zx0rB6l8+EbwMiIGHxlpBLG7zI46LxShX6bw6EC/HgUo+U1 4YPk23gD5UvHcm6zP5+uVOor/p78RFxts6NcNeyus3scDWNtf9jsVn1tPy4tZlsROZ2Q Nh4Wo+dJDZXueEPnWcj32NNtUUe5yAllDH4K2a8WesuVN2mVH0NSbog5YAyvAaScpYCO nf4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WZAIkoj4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d22si7806339ote.183.2020.03.10.06.04.15; Tue, 10 Mar 2020 06:04:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WZAIkoj4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730419AbgCJNCb (ORCPT + 99 others); Tue, 10 Mar 2020 09:02:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:45360 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730405AbgCJNC2 (ORCPT ); Tue, 10 Mar 2020 09:02:28 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 078EC208E4; Tue, 10 Mar 2020 13:02:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583845347; bh=22sNoVOJbg4BfYZ+GIVCznSyVW221vl8ZWg+Q1z3x4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WZAIkoj4f05PvXa67hTZg50p+ElA3s+MPa2TVVZdQCUHrrkM7NayZXeufCPF+Qf8u Nzctr5V1mmdN2/xdFmCve7FPQPkEmeA3HvkTYhFic3GDUGtyTf19rpU28tEPzL2ojZ AHfygN+kJryiF505tHMNyBLrd4E1SFZpMpxN0ec8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Chris Wilson , Jani Nikula Subject: [PATCH 5.5 149/189] drm/i915/selftests: Fix return in assert_mmap_offset() Date: Tue, 10 Mar 2020 13:39:46 +0100 Message-Id: <20200310123654.913961060@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200310123639.608886314@linuxfoundation.org> References: <20200310123639.608886314@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter commit f4aaa44e8b20f7e0d4ea68d3bca4968b6ae5aaff upstream. The assert_mmap_offset() returns type bool so if we return an error pointer that is "return true;" or success. If we have an error, then we should return false. Fixes: 3d81d589d6e3 ("drm/i915: Test exhaustion of the mmap space") Signed-off-by: Dan Carpenter Reviewed-by: Chris Wilson Signed-off-by: Chris Wilson Link: https://patchwork.freedesktop.org/patch/msgid/20200228141413.qfjf4abr323drlo4@kili.mountain (cherry picked from commit efbf928824820f2738f41271934f6ec2c6ebd587) Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c @@ -567,7 +567,7 @@ static bool assert_mmap_offset(struct dr obj = i915_gem_object_create_internal(i915, size); if (IS_ERR(obj)) - return PTR_ERR(obj); + return false; err = create_mmap_offset(obj); i915_gem_object_put(obj);