From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 93110C432C0 for ; Fri, 22 Nov 2019 05:57:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5D66620659 for ; Fri, 22 Nov 2019 05:57:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402242; bh=tmPBE1L64k7gFUNouMWYajVti7VOhZkUSGOVv4eEhyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gaLeV8qYTQFFv2s+zVzGQ9VMGbosg7mFCksbEg2BIEKmELSbpcIKQwj5tT5UGhTWn Cna5l5Y+RO/Mgl92aXt8jZa3Cez1F0viaNu1HA0bRS+tst7p2jVy7kZEm0WMfp+FuE +ZMiH6XU1X5vDvsOC9WU1ZVJARCXmhtlzXmUGusA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729412AbfKVF5U (ORCPT ); Fri, 22 Nov 2019 00:57:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:35306 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729374AbfKVF5J (ORCPT ); Fri, 22 Nov 2019 00:57:09 -0500 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 C5D0D2072E; Fri, 22 Nov 2019 05:57:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402229; bh=tmPBE1L64k7gFUNouMWYajVti7VOhZkUSGOVv4eEhyg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=imJY0xb+c9mY7G1fIZU7IlwC+TLuq42+gyktNtn9Tm1pnznLqS8G24fQP52GH9iU6 32wpPY0DNUC1JqIWrNbkM4X/mhAgpp7Ou4KO3KlO22IdS8vISXKuPfqEP+LUIuovmY EqpYC9ZFxZHV/9h9mU/k7+3TDM9U6Kl/DH504LeU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Kangjie Lu , Mark Brown , Sasha Levin , linux-omap@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 075/127] regulator: tps65910: fix a missing check of return value Date: Fri, 22 Nov 2019 00:54:53 -0500 Message-Id: <20191122055544.3299-74-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122055544.3299-1-sashal@kernel.org> References: <20191122055544.3299-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: Kangjie Lu [ Upstream commit cd07e3701fa6a4c68f8493ee1d12caa18d46ec6a ] tps65910_reg_set_bits() may fail. The fix checks if it fails, and if so, returns with its error code. Signed-off-by: Kangjie Lu Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/regulator/tps65910-regulator.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index 81672a58fcc23..194fa0cbbc048 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c @@ -1102,8 +1102,10 @@ static int tps65910_probe(struct platform_device *pdev) platform_set_drvdata(pdev, pmic); /* Give control of all register to control port */ - tps65910_reg_set_bits(pmic->mfd, TPS65910_DEVCTRL, + err = tps65910_reg_set_bits(pmic->mfd, TPS65910_DEVCTRL, DEVCTRL_SR_CTL_I2C_SEL_MASK); + if (err < 0) + return err; switch (tps65910_chip_id(tps65910)) { case TPS65910: -- 2.20.1