commit 6f397d5ffa874a7a00b45a0d10d5c5b33cc0cd58
author Linux Build Service Account <lnxbuild@localhost> Mon Apr 03 18:14:25 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Apr 03 18:14:25 2017 -0700
tree 237b3264a16c7d71853d45334b5698843fbcbb3b
parent 062276f69b7c4eeaa6cc267a43150c806d81baf7
parent 626232a81230550f8d94d815e00c91727a1fd6e7

Merge "ASoC: wsa881x: Fix boost enable sequence" into msm-4.9

sound/soc/codecs/wsa881x.c

diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c
index e689570..fe15a57 100644
--- a/sound/soc/codecs/wsa881x.c
+++ b/sound/soc/codecs/wsa881x.c
@@ -757,15 +757,13 @@
 	switch (event) {
 	case SND_SOC_DAPM_PRE_PMU:
 		wsa881x_resource_acquire(codec, ENABLE);
-		if (wsa881x->boost_enable)
-			wsa881x_boost_ctrl(codec, ENABLE);
+		wsa881x_boost_ctrl(codec, ENABLE);
 		break;
 	case SND_SOC_DAPM_POST_PMD:
 		swr_slvdev_datapath_control(wsa881x->swr_slave,
 					    wsa881x->swr_slave->dev_num,
 					    false);
-		if (wsa881x->boost_enable)
-			wsa881x_boost_ctrl(codec, DISABLE);
+		wsa881x_boost_ctrl(codec, DISABLE);
 		wsa881x_resource_acquire(codec, DISABLE);
 		break;
 	}