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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 830C8ECE599 for ; Wed, 16 Oct 2019 22:16:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4FA57207FF for ; Wed, 16 Oct 2019 22:16:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571264169; bh=cOwtfjxBvvQosjr82wqCP+8UkphEQZiAwZA6WXjNgSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nl6+uo69366dykiqMrp3zV8g7N3T8LJ+I0vkf+e0lNu37iQK/YvpagV/sAjgiskjl l3bux1lPA8d1tngke3PMwv5qF68gm4o3WvylnFDF/AtnJXRmqRAAHETHV4WN79yEAR urLKX2BWFpBjW8BXjAHns2R/0/7hqx41mY/s21bQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437734AbfJPVzP (ORCPT ); Wed, 16 Oct 2019 17:55:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:45692 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2437728AbfJPVzO (ORCPT ); Wed, 16 Oct 2019 17:55:14 -0400 Received: from localhost (unknown [192.55.54.58]) (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 2A0C921925; Wed, 16 Oct 2019 21:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1571262914; bh=cOwtfjxBvvQosjr82wqCP+8UkphEQZiAwZA6WXjNgSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0M805NDwb0Zf96aqgG0xOdyTVXc/ddVN4ziw7qnv9BY6aIKqbanq3wgR6xC2V+rRH FM9c6JLnChmuchL71mn3avmQdyN2HZ90RSJKg5H0lbIIwc8bIhYp6HBNEzAcHH3fiD nyJB+kUwcEovDEbu7WKEYkus24s8ykWUc+m/EgPU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Marco Felsch , Alexandru Ardelean , Stable@vger.kernel.org, Jonathan Cameron Subject: [PATCH 4.9 74/92] iio: adc: ad799x: fix probe error handling Date: Wed, 16 Oct 2019 14:50:47 -0700 Message-Id: <20191016214845.288036467@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191016214759.600329427@linuxfoundation.org> References: <20191016214759.600329427@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marco Felsch commit c62dd44901cfff12acc5792bf3d2dec20bcaf392 upstream. 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: Greg Kroah-Hartman --- drivers/iio/adc/ad799x.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/iio/adc/ad799x.c +++ b/drivers/iio/adc/ad799x.c @@ -817,10 +817,10 @@ static int ad799x_probe(struct i2c_clien 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,