Skip to content
This repository was archived by the owner on Apr 8, 2024. It is now read-only.

Commit 08865eb

Browse files
Philipp Puschmanngregkh
authored andcommitted
ASoC: tas571x: disable regulators on failed probe
commit 9df8ba7c63073508e5aa677dade48fcab6a6773e upstream. If probe fails after enabling the regulators regulator_put is called for each supply without having them disabled before. This produces some warnings like WARNING: CPU: 0 PID: 90 at drivers/regulator/core.c:2044 _regulator_put.part.0+0x154/0x15c [<c010f7a8>] (unwind_backtrace) from [<c010c544>] (show_stack+0x10/0x14) [<c010c544>] (show_stack) from [<c012b640>] (__warn+0xd0/0xf4) [<c012b640>] (__warn) from [<c012b9b4>] (warn_slowpath_fmt+0x64/0xc4) [<c012b9b4>] (warn_slowpath_fmt) from [<c04c4064>] (_regulator_put.part.0+0x154/0x15c) [<c04c4064>] (_regulator_put.part.0) from [<c04c4094>] (regulator_put+0x28/0x38) [<c04c4094>] (regulator_put) from [<c04c40cc>] (regulator_bulk_free+0x28/0x38) [<c04c40cc>] (regulator_bulk_free) from [<c0579b2c>] (release_nodes+0x1d0/0x22c) [<c0579b2c>] (release_nodes) from [<c05756dc>] (really_probe+0x108/0x34c) [<c05756dc>] (really_probe) from [<c0575aec>] (driver_probe_device+0xb8/0x16c) [<c0575aec>] (driver_probe_device) from [<c0575d40>] (device_driver_attach+0x58/0x60) [<c0575d40>] (device_driver_attach) from [<c0575da0>] (__driver_attach+0x58/0xcc) [<c0575da0>] (__driver_attach) from [<c0573978>] (bus_for_each_dev+0x78/0xc0) [<c0573978>] (bus_for_each_dev) from [<c0574b5c>] (bus_add_driver+0x188/0x1e0) [<c0574b5c>] (bus_add_driver) from [<c05768b0>] (driver_register+0x74/0x108) [<c05768b0>] (driver_register) from [<c061ab7c>] (i2c_register_driver+0x3c/0x88) [<c061ab7c>] (i2c_register_driver) from [<c0102df8>] (do_one_initcall+0x58/0x250) [<c0102df8>] (do_one_initcall) from [<c01a91bc>] (do_init_module+0x60/0x244) [<c01a91bc>] (do_init_module) from [<c01ab5a4>] (load_module+0x2180/0x2540) [<c01ab5a4>] (load_module) from [<c01abbd4>] (sys_finit_module+0xd0/0xe8) [<c01abbd4>] (sys_finit_module) from [<c01011e0>] (__sys_trace_return+0x0/0x20) Fixes: 3fd6e7d (ASoC: tas571x: New driver for TI TAS571x power amplifiers) Signed-off-by: Philipp Puschmann <p.puschmann@pironex.de> Link: https://lore.kernel.org/r/20200414112754.3365406-1-p.puschmann@pironex.de Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e9058b4 commit 08865eb

1 file changed

Lines changed: 15 additions & 5 deletions

File tree

sound/soc/codecs/tas571x.c

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -820,8 +820,10 @@ static int tas571x_i2c_probe(struct i2c_client *client,
820820

821821
priv->regmap = devm_regmap_init(dev, NULL, client,
822822
priv->chip->regmap_config);
823-
if (IS_ERR(priv->regmap))
824-
return PTR_ERR(priv->regmap);
823+
if (IS_ERR(priv->regmap)) {
824+
ret = PTR_ERR(priv->regmap);
825+
goto disable_regs;
826+
}
825827

826828
priv->pdn_gpio = devm_gpiod_get_optional(dev, "pdn", GPIOD_OUT_LOW);
827829
if (IS_ERR(priv->pdn_gpio)) {
@@ -845,7 +847,7 @@ static int tas571x_i2c_probe(struct i2c_client *client,
845847

846848
ret = regmap_write(priv->regmap, TAS571X_OSC_TRIM_REG, 0);
847849
if (ret)
848-
return ret;
850+
goto disable_regs;
849851

850852
usleep_range(50000, 60000);
851853

@@ -861,12 +863,20 @@ static int tas571x_i2c_probe(struct i2c_client *client,
861863
*/
862864
ret = regmap_update_bits(priv->regmap, TAS571X_MVOL_REG, 1, 0);
863865
if (ret)
864-
return ret;
866+
goto disable_regs;
865867
}
866868

867-
return devm_snd_soc_register_component(&client->dev,
869+
ret = devm_snd_soc_register_component(&client->dev,
868870
&priv->component_driver,
869871
&tas571x_dai, 1);
872+
if (ret)
873+
goto disable_regs;
874+
875+
return ret;
876+
877+
disable_regs:
878+
regulator_bulk_disable(priv->chip->num_supply_names, priv->supplies);
879+
return ret;
870880
}
871881

872882
static int tas571x_i2c_remove(struct i2c_client *client)

0 commit comments

Comments
 (0)