diff options
| author | Laxminath Kasam <lkasam@codeaurora.org> | 2017-02-28 20:45:55 +0530 |
|---|---|---|
| committer | Laxminath Kasam <lkasam@codeaurora.org> | 2017-02-28 20:55:55 +0530 |
| commit | 618936473f767394932adf86b59ee0081606bb6c (patch) | |
| tree | 59aeb162c9ca0e79530451024526be1c3c470ede | |
| parent | 10a55a587418b3c37a57b4beae8337432b6ff3c0 (diff) | |
ASoC: wsa881x: remove retry logic in swr_startup
Avoid retry logic in swr_startup API as it results
in speaker mute on sdm660 external codec.
CRs-Fixed: 2012814
Change-Id: Ic8876fd6e62081253a46e4e896d154043d5170db
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>
| -rw-r--r-- | sound/soc/codecs/wsa881x.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sound/soc/codecs/wsa881x.c b/sound/soc/codecs/wsa881x.c index 6addbde34545..676c3b0335ef 100644 --- a/sound/soc/codecs/wsa881x.c +++ b/sound/soc/codecs/wsa881x.c @@ -1094,7 +1094,6 @@ static int wsa881x_swr_startup(struct swr_device *swr_dev) { int ret = 0; u8 devnum = 0; - u8 retry = WSA881X_NUM_RETRY; struct wsa881x_priv *wsa881x; wsa881x = swr_get_dev_data(swr_dev); @@ -1109,16 +1108,12 @@ static int wsa881x_swr_startup(struct swr_device *swr_dev) * as per HW requirement. */ usleep_range(5000, 5010); - while (swr_get_logical_dev_num(swr_dev, swr_dev->addr, &devnum) && - retry--) { - /* Retry after 1 msec delay */ - usleep_range(1000, 1100); - } - if (retry == 0) { - dev_err(&swr_dev->dev, + ret = swr_get_logical_dev_num(swr_dev, swr_dev->addr, &devnum); + if (ret) { + dev_dbg(&swr_dev->dev, "%s get devnum %d for dev addr %lx failed\n", __func__, devnum, swr_dev->addr); - return -EINVAL; + goto err; } swr_dev->dev_num = devnum; |