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 F0B66CA9EA0 for ; Fri, 18 Oct 2019 22:17:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BAB7B222C3 for ; Fri, 18 Oct 2019 22:17:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571437056; bh=LsUG1KSp6iYx6j84Y/bZiOCQcl+x2YbXkmFR2WtwB3w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=x1d0lwij5601SU6XikRFgNVJU/OxdtawEm5lIxqOCcgq6np6D91FPH47ezj/01Fhi fceEwBjd+LwXmgZXTkxI2sjrrVEovwJZtgkx+nUnj3TkmX50m/h1Coe6ZeiBzth2nI bqJAKBxagGvOJJkDetvVqQYVYPyx+UutiMcwnIEs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733130AbfJRWRf (ORCPT ); Fri, 18 Oct 2019 18:17:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:40014 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733114AbfJRWHk (ORCPT ); Fri, 18 Oct 2019 18:07:40 -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 EDD332246A; Fri, 18 Oct 2019 22:07:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571436459; bh=LsUG1KSp6iYx6j84Y/bZiOCQcl+x2YbXkmFR2WtwB3w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yQd2+h/0Yy1dweOGuZveJ1i4GO4PeH2hT2tT7Mkp/IN9byCt4hV9830snaRFoBwgI CIgQds7MqB4ai+yKHrpGkOwAP5i59XGiJeq6o2lgkVuehktqVrXmavAaduNPCYksLR otMlQ6TgSFLhpk05TZydgfIyzW7ARtVBbtLFmMSg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marco Felsch , Alexandru Ardelean , Stable@vger.kernel.org, Jonathan Cameron , Sasha Levin , linux-iio@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 091/100] iio: adc: ad799x: fix probe error handling Date: Fri, 18 Oct 2019 18:05:16 -0400 Message-Id: <20191018220525.9042-91-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191018220525.9042-1-sashal@kernel.org> References: <20191018220525.9042-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marco Felsch [ Upstream commit c62dd44901cfff12acc5792bf3d2dec20bcaf392 ] Since commit 0f7ddcc1bff1 ("iio:adc:ad799x: Write default config on probe and reset alert status on probe") the error path is wrong since it leaves the vref regulator on. Fix this by disabling both regulators. Fixes: 0f7ddcc1bff1 ("iio:adc:ad799x: Write default config on probe and reset alert status on probe") Signed-off-by: Marco Felsch Reviewed-by: Alexandru Ardelean Cc: Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/iio/adc/ad799x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iio/adc/ad799x.c b/drivers/iio/adc/ad799x.c index e1da67d5ee220..9e61720db7eaf 100644 --- a/drivers/iio/adc/ad799x.c +++ b/drivers/iio/adc/ad799x.c @@ -814,10 +814,10 @@ static int ad799x_probe(struct i2c_client *client, ret = ad799x_write_config(st, st->chip_config->default_config); if (ret < 0) - goto error_disable_reg; + goto error_disable_vref; ret = ad799x_read_config(st); if (ret < 0) - goto error_disable_reg; + goto error_disable_vref; st->config = ret; ret = iio_triggered_buffer_setup(indio_dev, NULL, -- 2.20.1