| From 2d2a5738da7fc49bb58a12a3f52bfc42972f4444 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 3 May 2021 13:57:23 +0200 |
| Subject: Revert "ASoC: cs43130: fix a NULL pointer dereference" |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| [ Upstream commit fdda0dd2686ecd1f2e616c9e0366ea71b40c485d ] |
| |
| This reverts commit a2be42f18d409213bb7e7a736e3ef6ba005115bb. |
| |
| Because of recent interactions with developers from @umn.edu, all |
| commits from them have been recently re-reviewed to ensure if they were |
| correct or not. |
| |
| Upon review, this commit was found to be incorrect for the reasons |
| below, so it must be reverted. It will be fixed up "correctly" in a |
| later kernel change. |
| |
| The original patch here is not correct, sysfs files that were created |
| are not unwound. |
| |
| Cc: Kangjie Lu <kjlu@umn.edu> |
| Cc: Mark Brown <broonie@kernel.org> |
| Link: https://lore.kernel.org/r/20210503115736.2104747-57-gregkh@linuxfoundation.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| sound/soc/codecs/cs43130.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| diff --git a/sound/soc/codecs/cs43130.c b/sound/soc/codecs/cs43130.c |
| index 80bc7c10ed75..c2b6f0ae6d57 100644 |
| --- a/sound/soc/codecs/cs43130.c |
| +++ b/sound/soc/codecs/cs43130.c |
| @@ -2319,8 +2319,6 @@ static int cs43130_probe(struct snd_soc_component *component) |
| return ret; |
| |
| cs43130->wq = create_singlethread_workqueue("cs43130_hp"); |
| - if (!cs43130->wq) |
| - return -ENOMEM; |
| INIT_WORK(&cs43130->work, cs43130_imp_meas); |
| } |
| |
| -- |
| 2.30.2 |
| |