[alsa-devel] [patch] ASoC: rt5665: Unlock on error in rt5665_calibrate()
![](https://secure.gravatar.com/avatar/85ff6b2aa66ef9f0bf35105783fd2ae2.jpg?s=120&d=mm&r=g)
We should probably unlock before returning here.
Fixes: 33ada14a26c8 ("ASoC: add rt5665 codec driver") Signed-off-by: Dan Carpenter dan.carpenter@oracle.com
diff --git a/sound/soc/codecs/rt5665.c b/sound/soc/codecs/rt5665.c index 34254fd..25bd01b 100644 --- a/sound/soc/codecs/rt5665.c +++ b/sound/soc/codecs/rt5665.c @@ -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 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 unlock; }
count++; @@ -4620,7 +4620,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); - +unlock: mutex_unlock(&rt5665->calibrate_mutex); }
![](https://secure.gravatar.com/avatar/d930951cb00393ecf9c3db3a56d78fa9.jpg?s=120&d=mm&r=g)
On Fri, Nov 18, 2016 at 02:56:11PM +0300, Dan Carpenter wrote:
We should probably unlock before returning here.
Fixes: 33ada14a26c8 ("ASoC: add rt5665 codec driver") Signed-off-by: Dan Carpenter dan.carpenter@oracle.com
This doesn't apply against current code, please check and resend.
participants (2)
-
Dan Carpenter
-
Mark Brown