drop broken asoc patch from 4.4 and 4.9 trees

diff --git a/queue-4.4/asoc-sta32x-set-component-pointer-in-private-struct.patch b/queue-4.4/asoc-sta32x-set-component-pointer-in-private-struct.patch
deleted file mode 100644 (file)
index 9c6fdac..0000000
--- a/queue-4.4/asoc-sta32x-set-component-pointer-in-private-struct.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From edd4f70be70d90e70ddfcd3d139098db43e4f580 Mon Sep 17 00:00:00 2001
-From: Daniel Mack <daniel@zonque.org>
-Date: Thu, 11 Oct 2018 20:32:05 +0200
-Subject: ASoC: sta32x: set ->component pointer in private struct
-
-[ Upstream commit 747df19747bc9752cd40b9cce761e17a033aa5c2 ]
-
-The ESD watchdog code in sta32x_watchdog() dereferences the pointer
-which is never assigned.
-
-This is a regression from a1be4cead9b950 ("ASoC: sta32x: Convert to direct
-regmap API usage.") which went unnoticed since nobody seems to use that ESD
-workaround.
-
-Fixes: a1be4cead9b950 ("ASoC: sta32x: Convert to direct regmap API usage.")
-Signed-off-by: Daniel Mack <daniel@zonque.org>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Cc: stable@vger.kernel.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/codecs/sta32x.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
-index a9844b2ac829..c3eacf46b551 100644
---- a/sound/soc/codecs/sta32x.c
-+++ b/sound/soc/codecs/sta32x.c
-@@ -880,6 +880,9 @@ static int sta32x_probe(struct snd_soc_codec *codec)
-       struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
-       struct sta32x_platform_data *pdata = sta32x->pdata;
-       int i, ret = 0, thermal = 0;
-+
-+      sta32x->component = component;
-+
-       ret = regulator_bulk_enable(ARRAY_SIZE(sta32x->supplies),
-                                   sta32x->supplies);
-       if (ret != 0) {
--- 
-2.19.1
-

diff --git a/queue-4.4/series b/queue-4.4/series
index a260b9328180afd87929bd190c09226b15ea46b3..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -1 +0,0 @@
-asoc-sta32x-set-component-pointer-in-private-struct.patch

diff --git a/queue-4.9/asoc-sta32x-set-component-pointer-in-private-struct.patch b/queue-4.9/asoc-sta32x-set-component-pointer-in-private-struct.patch
deleted file mode 100644 (file)
index 23566f7..0000000
--- a/queue-4.9/asoc-sta32x-set-component-pointer-in-private-struct.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 83442a4d7bc6c61299498e38575a4b2027f02d9e Mon Sep 17 00:00:00 2001
-From: Daniel Mack <daniel@zonque.org>
-Date: Thu, 11 Oct 2018 20:32:05 +0200
-Subject: ASoC: sta32x: set ->component pointer in private struct
-
-[ Upstream commit 747df19747bc9752cd40b9cce761e17a033aa5c2 ]
-
-The ESD watchdog code in sta32x_watchdog() dereferences the pointer
-which is never assigned.
-
-This is a regression from a1be4cead9b950 ("ASoC: sta32x: Convert to direct
-regmap API usage.") which went unnoticed since nobody seems to use that ESD
-workaround.
-
-Fixes: a1be4cead9b950 ("ASoC: sta32x: Convert to direct regmap API usage.")
-Signed-off-by: Daniel Mack <daniel@zonque.org>
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Cc: stable@vger.kernel.org
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- sound/soc/codecs/sta32x.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
-index 0790ae8530d9..7b8b2de02846 100644
---- a/sound/soc/codecs/sta32x.c
-+++ b/sound/soc/codecs/sta32x.c
-@@ -880,6 +880,9 @@ static int sta32x_probe(struct snd_soc_codec *codec)
-       struct sta32x_priv *sta32x = snd_soc_codec_get_drvdata(codec);
-       struct sta32x_platform_data *pdata = sta32x->pdata;
-       int i, ret = 0, thermal = 0;
-+
-+      sta32x->component = component;
-+
-       ret = regulator_bulk_enable(ARRAY_SIZE(sta32x->supplies),
-                                   sta32x->supplies);
-       if (ret != 0) {
--- 
-2.19.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 84bb87e230a4be281e41738e9164fd1611556676..d0601b40be780a8361a6251006c2cbda15dc10f4 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -1,4 +1,3 @@
 block-break-discard-submissions-into-the-user-define.patch
 block-fix-infinite-loop-if-the-device-loses-discard-.patch
-asoc-sta32x-set-component-pointer-in-private-struct.patch
 ib_srpt-fix-a-use-after-free-in-__srpt_close_all_ch.patch