Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp978419ybt; Wed, 17 Jun 2020 19:44:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw13S5OmzIuKm6b8X2TiZ+nxiD9/5GLKWxPJOn1miHziytbOTZ/KHHtskrusqIJnqSAlaFb X-Received: by 2002:a05:6402:2070:: with SMTP id bd16mr1973897edb.35.1592448281929; Wed, 17 Jun 2020 19:44:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592448281; cv=none; d=google.com; s=arc-20160816; b=RWwVGpiFZ5PJ4G1P/LJHPZO057juu/iW8MPdQFBhqkkpGk4zo2csanGkUU4UETBfVm 7W9R+bwuJYVgwlQAYHBFGqKCfL3xyXMYWF4GOBRk3yZ8rWVJQHHNdglGOrFQaa4gn9Cx hunVBcYYQcCzKb1ouQi+nq4254yvsui+2d19AOwy9gjw/PKXseq/WxfrmAs/gMxO+zBw YmkWCqZDzAiHfAyrxmQDwRHBOrKTF95GNfmDRE2e9C58To7bxibaeI+qTzSuf+8DwyRd +xYpyYLU6eUecNBxcxLTwY8Z1V3lhP6eVgbnX0WKQ5PuwBOe64ACwctPu7/PxR5XSIUJ SUTQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=osoficOf4k3qbQm6P4Os9M3BA3SFygT1FCFCl71aHMk=; b=bw3zNtygjqUJTxN/54eMJR/jJq8Tou/lOGUoDnwOCnGYZmLYTDuHE6Pd0lF64o9e+B PeRXd0BFcGSkWTba7jwP9I19iXVfHtLrObmq6bfIptMubSRu0UxzqGHktAYUzaFhC3Ob ADlmmjQJh3lSCSwq9Qrt8AzVdqmpUUROKaCskGW7p9ce/Dx5B/pg+sPy5IluRyuduqFe FYLmzHnRMqvmeGhBK/T7VfrybGu1ezMJpuxjWRyPum/Oqb9rUm1FaFR8a5RaJPrfAwbY ADWm6Vv/UfOgtTtZFW1TvrVqlsg6DbObKkAdY+YeWkggjF0WUCiBmG0Tovsy8BRTcjJK ulAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="f8/LkF6l"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id eb11si1547458edb.302.2020.06.17.19.44.19; Wed, 17 Jun 2020 19:44:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="f8/LkF6l"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728059AbgFRBL7 (ORCPT + 99 others); Wed, 17 Jun 2020 21:11:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:39144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728724AbgFRBLV (ORCPT ); Wed, 17 Jun 2020 21:11:21 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0AA7921D7E; Thu, 18 Jun 2020 01:11:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442680; bh=fxCOpNL5PzHIllp2b2ox6kGkdS74HuH27Q+yujg1qMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=f8/LkF6lS3Xt0ARQica5gkuwBxbOVC2+f/r0pW4pzrThIBGOP6s9eCY4kUNbBgcNn dkg/ePpehI7ILK3ey2Wjr7gVc/bC9tO2lu+fOJUxFKHgBYxU38ho3NUfguCAWH/L3w TvgAOBNyv0SBmhVtWo1OuxNeO//0Nwx1novJ253I= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wei Yongjun , Linus Walleij , Sasha Levin , linux-gpio@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 148/388] gpio: mlxbf2: fix return value check in mlxbf2_gpio_get_lock_res() Date: Wed, 17 Jun 2020 21:04:05 -0400 Message-Id: <20200618010805.600873-148-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei Yongjun [ Upstream commit 66d8ad67aab3bc6f55e7de81565cd0d4875bd851 ] In case of error, the function devm_ioremap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Signed-off-by: Wei Yongjun Link: https://lore.kernel.org/r/20200427110829.154785-1-weiyongjun1@huawei.com Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/gpio/gpio-mlxbf2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/gpio-mlxbf2.c b/drivers/gpio/gpio-mlxbf2.c index da570e63589d..cc0dd8593a4b 100644 --- a/drivers/gpio/gpio-mlxbf2.c +++ b/drivers/gpio/gpio-mlxbf2.c @@ -110,8 +110,8 @@ static int mlxbf2_gpio_get_lock_res(struct platform_device *pdev) } yu_arm_gpio_lock_param.io = devm_ioremap(dev, res->start, size); - if (IS_ERR(yu_arm_gpio_lock_param.io)) - ret = PTR_ERR(yu_arm_gpio_lock_param.io); + if (!yu_arm_gpio_lock_param.io) + ret = -ENOMEM; exit: mutex_unlock(yu_arm_gpio_lock_param.lock); -- 2.25.1