From 84bb791c34677faa59cd4b84bcea8486d253c5e1 Mon Sep 17 00:00:00 2001 From: Vignesh Kulothungan Date: Wed, 19 Feb 2020 16:18:40 -0800 Subject: [PATCH] ASoC: codecs: remove dmic device during dev err Remove sound wire dmic device from master device list only during critical error and not for probe defer. Signed-off-by: Vignesh Kulothungan --- asoc/codecs/swr-dmic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/asoc/codecs/swr-dmic.c b/asoc/codecs/swr-dmic.c index 27610974e9..c6b2e42f73 100644 --- a/asoc/codecs/swr-dmic.c +++ b/asoc/codecs/swr-dmic.c @@ -406,7 +406,7 @@ static int swr_dmic_probe(struct swr_device *pdev) ret = enable_wcd_codec_supply(swr_dmic, true); if (ret) { ret = -EPROBE_DEFER; - goto dev_err; + goto err; } ++swr_dmic->is_en_supply; } @@ -445,7 +445,7 @@ static int swr_dmic_probe(struct swr_device *pdev) "%s get devnum %d for dev addr %lx failed\n", __func__, swr_devnum, pdev->addr); ret = -EPROBE_DEFER; - goto dev_err; + goto err; } pdev->dev_num = swr_devnum;