Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASOC: Fix the error handling code of the probe

Browse Source 
Merge series from Zheyu Ma <zheyuma97@gmail.com>:

These drivers mishandle the regulator resource in the probe function,
failing to disable the regulator for probing failure.
This commit is contained in:
Mark Brown 2022-05-12 11:06:30 +01:00
commit 8b7a4075a5
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/cs35l36.c
View File

@ -1803,7 +1803,7 @@ static int cs35l36_i2c_probe(struct i2c_client *i2c_client)
if (ret < 0) {
dev_err(&i2c_client->dev, "Failed to read otp_id Register %d\n",
ret);
return ret;
goto err;
}
if ((l37_id_reg & CS35L36_OTP_REV_MASK) == CS35L36_OTP_REV_L37)

4
sound/soc/codecs/rt5645.c
View File

@ -3943,7 +3943,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c)
ret = PTR_ERR(regmap);
dev_err(&i2c->dev, "Failed to allocate temp register map: %d\n",
ret);
return ret;
goto err_enable;
}
/*
@ -3974,7 +3974,7 @@ static int rt5645_i2c_probe(struct i2c_client *i2c)
ret = PTR_ERR(rt5645->regmap);
dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
ret);
return ret;
goto err_enable;
}
regmap_write(rt5645->regmap, RT5645_RESET, 0);

6
sound/soc/codecs/tas571x.c
View File

@ -833,7 +833,8 @@ static int tas571x_i2c_probe(struct i2c_client *client)
if (IS_ERR(priv->pdn_gpio)) {
dev_err(dev, "error requesting pdn_gpio: %ld\n",
PTR_ERR(priv->pdn_gpio));
return PTR_ERR(priv->pdn_gpio);
ret = PTR_ERR(priv->pdn_gpio);
goto disable_regs;
}
priv->reset_gpio = devm_gpiod_get_optional(dev, "reset",
@ -841,7 +842,8 @@ static int tas571x_i2c_probe(struct i2c_client *client)
if (IS_ERR(priv->reset_gpio)) {
dev_err(dev, "error requesting reset_gpio: %ld\n",
PTR_ERR(priv->reset_gpio));
return PTR_ERR(priv->reset_gpio);
ret = PTR_ERR(priv->reset_gpio);
goto disable_regs;
} else if (priv->reset_gpio) {
/* pulse the active low reset line for ~100us */
usleep_range(100, 200);

8
sound/soc/codecs/tas6424.c
View File

@ -756,7 +756,7 @@ static int tas6424_i2c_probe(struct i2c_client *client)
TAS6424_RESET, TAS6424_RESET);
if (ret) {
dev_err(dev, "unable to reset device: %d\n", ret);
return ret;
goto disable_regs;
}
INIT_DELAYED_WORK(&tas6424->fault_check_work, tas6424_fault_check_work);
@ -765,10 +765,14 @@ static int tas6424_i2c_probe(struct i2c_client *client)
tas6424_dai, ARRAY_SIZE(tas6424_dai));
if (ret < 0) {
dev_err(dev, "unable to register codec: %d\n", ret);
return ret;
goto disable_regs;
}
return 0;
disable_regs:
regulator_bulk_disable(ARRAY_SIZE(tas6424->supplies), tas6424->supplies);
return ret;
}
static int tas6424_i2c_remove(struct i2c_client *client)

2
sound/soc/codecs/wm8903.c
View File

@ -2131,7 +2131,7 @@ static int wm8903_i2c_probe(struct i2c_client *i2c)
if (ret != 0) {
dev_err(wm8903->dev, "Failed to request IRQ: %d\n",
ret);
return ret;
goto err;
}
/* Enable write sequencer interrupts */