diff mbox

ASoC: rt5665: Unlock on error in rt5665_calibrate()

Message ID 20161118115611.GA3784@mwanda (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter Nov. 18, 2016, 11:56 a.m. UTC 
We should probably unlock before returning here.

Fixes: 33ada14a26c8 ("ASoC: add rt5665 codec driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Comments

Mark Brown Nov. 18, 2016, 12:01 p.m. UTC | #1 
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.
diff mbox

Patch

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);
 }