Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1065238iob; Wed, 4 May 2022 13:56:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzewBFV7PtxlYHMAoNZNl1iXQSP9iVGVqCvKNy9CsrLbclgrt1ppSHTgha68ytcA7UuzIaX X-Received: by 2002:a17:902:c641:b0:15d:36e:cfa9 with SMTP id s1-20020a170902c64100b0015d036ecfa9mr23640992pls.67.1651697789421; Wed, 04 May 2022 13:56:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651697789; cv=none; d=google.com; s=arc-20160816; b=ZIs/MJl9DPkzy/VKb80WtfsJYoBEQKyOyXG2JuByFwpnlxoNfl4stgkn2twOFtUWQX halB8HWm+aA1+1SR+MVs93b5Z5LRkN4X1BKmDq2iKi37sv/1puaGkjIOoXNktg1vzoIC FIPLxhgaI8e6vnhHgQabaBqDSXXq8xRlvX9plSFsrTA23ew+vXKv8SaMs39Q+6zRkIoi x4SReFDf+UWSuqB3Gurn+n3QqUN9FWRLag21+QYaf+vtpwt4dw/UhORVMUJxV1rdYeuX 9rr+OgEvI/4/SCFSitzubqKXQaUgVlNXSU8hehXEuP3ITGaZD+7Z0aTNKkUZiXBRGRL3 0P9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ohWrZghvw/IVl36fbWnL6iUCWMuOn4fz8OtdDg2OcqY=; b=Mmkx/EgZH3Z065J368Al1OuszFn/nsZuhXuu4I2qMsWqzC9PAIRlGDwkDntHSViT2n KrXMt114n/DxtPhZQZr9SKaBC5AJNBIYDxiKSxNg4WC67nbFHX51n6IDnsrVoWJGbU73 V7tceQnbuaNJI8C5o0A1J0jKKALcKinfvexYGk0Gd+lqW4DbFi5aR3BLJT1uBXDu5uoE q0OMQRueoHV2t5iFC3Oq46iHD8YO2DjJKEP0ce80rxru1H7AlP/KIU3Mu6imZHO38qnK Kxj0ypkNqN9H4N3i6H3Sn0prFWr9+aiAAXUMykXSE89IFCpdSXZzqu/rggC5iKGj+84/ NGkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Et34VXqA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y19-20020a170902e19300b001567f49bb1csi18295891pla.516.2022.05.04.13.56.13; Wed, 04 May 2022 13:56:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Et34VXqA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356437AbiEDRrC (ORCPT + 99 others); Wed, 4 May 2022 13:47:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356591AbiEDRN6 (ORCPT ); Wed, 4 May 2022 13:13:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77D2F53A67; Wed, 4 May 2022 09:58:07 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 58222618B0; Wed, 4 May 2022 16:58:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9FF16C385B1; Wed, 4 May 2022 16:58:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683486; bh=HzXEB+jiefZVdvXEiPjM7zJ7btDrrLOGhLbd7Aa/u8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Et34VXqAu4ivN4dwnn9ugJCuRgF0z+j4luvOIf0olvT44bJqCvIgQE6hgmiIV/mvF mze5mX1SJSrB/Gm3EojF+QbjkeVIYfZS7EgN8JGp9w/sGqaoWUrTrQfgw3Lwu5W1Jb b7FVdQtF0zIe8JCwIE7KIW4gZap2hHaemKtGUWlg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zheyu Ma , Mark Brown , Sasha Levin Subject: [PATCH 5.17 161/225] ASoC: wm8731: Disable the regulator when probing fails Date: Wed, 4 May 2022 18:46:39 +0200 Message-Id: <20220504153124.363141736@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zheyu Ma [ Upstream commit 92ccbf17eeacf510cf1eed9c252d9332ca24f02d ] When the driver fails during probing, the driver should disable the regulator, not just handle it in wm8731_hw_init(). The following log reveals it: [ 17.812483] WARNING: CPU: 1 PID: 364 at drivers/regulator/core.c:2257 _regulator_put+0x3ec/0x4e0 [ 17.815958] RIP: 0010:_regulator_put+0x3ec/0x4e0 [ 17.824467] Call Trace: [ 17.824774] [ 17.825040] regulator_bulk_free+0x82/0xe0 [ 17.825514] devres_release_group+0x319/0x3d0 [ 17.825882] i2c_device_probe+0x766/0x940 [ 17.829198] i2c_register_driver+0xb5/0x130 Signed-off-by: Zheyu Ma Link: https://lore.kernel.org/r/20220405121038.4094051-1-zheyuma97@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/wm8731.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c index 86b1f6eaa599..518167d90b10 100644 --- a/sound/soc/codecs/wm8731.c +++ b/sound/soc/codecs/wm8731.c @@ -602,7 +602,7 @@ static int wm8731_hw_init(struct device *dev, struct wm8731_priv *wm8731) ret = wm8731_reset(wm8731->regmap); if (ret < 0) { dev_err(dev, "Failed to issue reset: %d\n", ret); - goto err_regulator_enable; + goto err; } /* Clear POWEROFF, keep everything else disabled */ @@ -619,10 +619,7 @@ static int wm8731_hw_init(struct device *dev, struct wm8731_priv *wm8731) regcache_mark_dirty(wm8731->regmap); -err_regulator_enable: - /* Regulators will be enabled by bias management */ - regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies); - +err: return ret; } @@ -760,21 +757,27 @@ static int wm8731_i2c_probe(struct i2c_client *i2c, ret = PTR_ERR(wm8731->regmap); dev_err(&i2c->dev, "Failed to allocate register map: %d\n", ret); - return ret; + goto err_regulator_enable; } ret = wm8731_hw_init(&i2c->dev, wm8731); if (ret != 0) - return ret; + goto err_regulator_enable; ret = devm_snd_soc_register_component(&i2c->dev, &soc_component_dev_wm8731, &wm8731_dai, 1); if (ret != 0) { dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret); - return ret; + goto err_regulator_enable; } return 0; + +err_regulator_enable: + /* Regulators will be enabled by bias management */ + regulator_bulk_disable(ARRAY_SIZE(wm8731->supplies), wm8731->supplies); + + return ret; } static int wm8731_i2c_remove(struct i2c_client *client) -- 2.35.1