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 D1CC4CA9EAB for ; Fri, 18 Oct 2019 22:15:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 933D021925 for ; Fri, 18 Oct 2019 22:15:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571436908; bh=NLmoFS64RoWdYxbg20A3xc1xvUz733WUVaV8uglnhwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lEEyZVqrGI6KPSPNCC7Unrgnb1einAc2KNmr6rgrN7yvn2DtH83p0GUIc0a/q/4S/ ZuOICmhBbA+f3G7L/qdYmfK7BMb/X7gThDy4E3/5fs254VT8rttnLmnYkOdSxxdLlm OzvqDiiabNpFyMuao5BjGyagl2oNvDj9+rVYFI/c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392477AbfJRWPG (ORCPT ); Fri, 18 Oct 2019 18:15:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:41860 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388596AbfJRWJK (ORCPT ); Fri, 18 Oct 2019 18:09:10 -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 8F257222D4; Fri, 18 Oct 2019 22:09:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571436549; bh=NLmoFS64RoWdYxbg20A3xc1xvUz733WUVaV8uglnhwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lC+U6hmC1IFKxHk2G4AFT780ecdmfzCLEbhQ6tSkjqFTs8+CsOWkbOsZAQg1WtYGj ouwVFFko8JNKdyTBOCUPJ0ToWpSD0NdSLXBphta6oGjRRgTBVCQ/YLZ3u2tFlogJSj JlUkuwrauBtSMv1ODWHVRvAWXyxLgjzzx9kKKeIs= 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.14 48/56] iio: adc: ad799x: fix probe error handling Date: Fri, 18 Oct 2019 18:07:45 -0400 Message-Id: <20191018220753.10002-48-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191018220753.10002-1-sashal@kernel.org> References: <20191018220753.10002-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 22426ae4af97a..7d1895035af68 100644 --- a/drivers/iio/adc/ad799x.c +++ b/drivers/iio/adc/ad799x.c @@ -817,10 +817,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