ASoC: rt5665: Fix missing mutex_unlock in rt5665_calibrate
Subsystems (3)
PATCH 1/2 ASoC: rt5665: Fix missing mutex_unlock in rt5665_calibrate
--- sound/soc/codecs/rt5665.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/codecs/rt5665.c +3 -2
@@ -4587,7 +4587,7 @@ static void rt5665_calibrate(struct rt5665_priv *rt5665)pr_err ("HP Calibration Failure\n" );regmap_write (rt5665->regmap,RT5665_RESET ,0 );regcache_cache_bypass (rt5665->regmap, false); -return ; + goto out_unlock; } count++;
@@ -4606,7 +4606,7 @@ static void rt5665_calibrate(struct rt5665_priv *rt5665)pr_err ("MONO Calibration Failure\n" );regmap_write (rt5665->regmap,RT5665_RESET ,0 );regcache_cache_bypass (rt5665->regmap, false); -return ; + goto out_unlock; } count++;
@@ -4621,6 +4621,7 @@ static void rt5665_calibrate(struct rt5665_priv *rt5665)regmap_write (rt5665->regmap,RT5665_BIAS_CUR_CTRL_8 ,0xa602 );regmap_write (rt5665->regmap,RT5665_ASRC_8 ,0x0120 ); +out_unlock:mutex_unlock (&rt5665->calibrate_mutex); }
Signature · 1 line
2.9.3
PATCH 2/2 ASoC: rt5665: Use devm_gpio_request_one()
Simplify the code a bit.
--- sound/soc/codecs/rt5665.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
sound/soc/codecs/rt5665.c +2 -4
@@ -4677,11 +4677,9 @@ static int rt5665_i2c_probe(struct i2c_client *i2c, }if (gpio_is_valid (rt5665->pdata.ldo1_en)) { -if (devm_gpio_request (&i2c->dev, rt5665->pdata.ldo1_en, -"rt5665" )) +if (devm_gpio_request_one (&i2c->dev, rt5665->pdata.ldo1_en, +GPIOF_OUT_INIT_HIGH ,"rt5665" ))dev_err (&i2c->dev,"Fail gpio_request gpio_ldo\n" ); -else if (gpio_direction_output (rt5665->pdata.ldo1_en,1 )) -dev_err (&i2c->dev,"Fail gpio_direction gpio_ldo\n" ); }/* Sleep for 300 ms miniumum */
Signature · 1 line
2.9.3
Mark Brown
maintainerApplied "ASoC: rt5665: Use devm_gpio_request_one()" to the asoc tree
The patch
ASoC: rt5665: Use devm_gpio_request_one()
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
f2826c1fe5d071fa437d337c41df979b60f0fc32Mon Sep 17 00:00:00 2001
From: Axel Lin <[email protected]>
Date: Wed, 16 Nov 2016 21:08:42 +0800
Subject: [PATCH] ASoC: rt5665: Use devm_gpio_request_one()
Simplify the code a bit.
--- sound/soc/codecs/rt5665.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
sound/soc/codecs/rt5665.c +2 -4
@@ -4677,11 +4677,9 @@ static int rt5665_i2c_probe(struct i2c_client *i2c, }if (gpio_is_valid (rt5665->pdata.ldo1_en)) { -if (devm_gpio_request (&i2c->dev, rt5665->pdata.ldo1_en, -"rt5665" )) +if (devm_gpio_request_one (&i2c->dev, rt5665->pdata.ldo1_en, +GPIOF_OUT_INIT_HIGH ,"rt5665" ))dev_err (&i2c->dev,"Fail gpio_request gpio_ldo\n" ); -else if (gpio_direction_output (rt5665->pdata.ldo1_en,1 )) -dev_err (&i2c->dev,"Fail gpio_direction gpio_ldo\n" ); }/* Sleep for 300 ms miniumum */
Signature · 1 line
2.10.2
Mark Brown
maintainerApplied "ASoC: rt5665: Fix missing mutex_unlock in rt5665_calibrate" to the asoc tree
In reply to Axel LinThe patch
ASoC: rt5665: Fix missing mutex_unlock in rt5665_calibrate
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
0c95666f0d7364e364ab53e068f7891c98e90012Mon Sep 17 00:00:00 2001
From: Axel Lin <[email protected]>
Date: Wed, 16 Nov 2016 21:08:41 +0800
Subject: [PATCH] ASoC: rt5665: Fix missing mutex_unlock in rt5665_calibrate
--- sound/soc/codecs/rt5665.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/soc/codecs/rt5665.c +3 -2
@@ -4587,7 +4587,7 @@ static void rt5665_calibrate(struct rt5665_priv *rt5665)pr_err ("HP Calibration Failure\n" );regmap_write (rt5665->regmap,RT5665_RESET ,0 );regcache_cache_bypass (rt5665->regmap, false); -return ; + goto out_unlock; } count++;
@@ -4606,7 +4606,7 @@ static void rt5665_calibrate(struct rt5665_priv *rt5665)pr_err ("MONO Calibration Failure\n" );regmap_write (rt5665->regmap,RT5665_RESET ,0 );regcache_cache_bypass (rt5665->regmap, false); -return ; + goto out_unlock; } count++;
@@ -4621,6 +4621,7 @@ static void rt5665_calibrate(struct rt5665_priv *rt5665)regmap_write (rt5665->regmap,RT5665_BIAS_CUR_CTRL_8 ,0xa602 );regmap_write (rt5665->regmap,RT5665_ASRC_8 ,0x0120 ); +out_unlock:mutex_unlock (&rt5665->calibrate_mutex); }
Signature · 1 line
2.10.2