Skip to contentSkip to conversation

FAILED: patch "[PATCH] ASoC: sta32x: set ->component pointer in private struct" failed to apply to 4.14-stable tree

PATCH Applied [email protected] 5 participants 6 messages Nov 12, 2018 – Dec 23, 2018

Subsystems (3)
Stable branch Sound ASoC
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 747df19747bc9752cd40b9cce761e17a033aa5c2 Mon Sep 17 00:00:00 2001

From: Daniel Mack <[email protected]>
Date: Thu, 11 Oct 2018 20:32:05 +0200
Subject: [PATCH] ASoC: sta32x: set ->component pointer in private struct

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 <[email protected]>
Signed-off-by Mark Brown <[email protected]>
Cc [email protected]
sound/soc/codecs/sta32x.c +3 -0
index d5035f2f2b2b..ce508b4cc85c 100644
@@ -879,6 +879,9 @@ static int sta32x_probe(struct snd_soc_component *component)
 	struct sta32x_priv *sta32x = snd_soc_component_get_drvdata(component);
 	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) {
#1 lore raw
Quoted 5 lines · On Sun, Nov 11, 2018 at 06:29:26AM -0800, [email protected] wrote:

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

The attached backported patch will apply to 4.14-stable tree. But I will prefer to wait for Mark or Daniel to confirm that I have not done something foolish.

--
Regards
Sudip

Quoted 1 line

From 8a3172ca525a0a990ddd739c8969129eaaad859f Mon Sep 17 00:00:00 2001

From: Daniel Mack <[email protected]>
Date: Thu, 11 Oct 2018 20:32:05 +0200
Subject: [PATCH] ASoC: sta32x: set ->component pointer in private struct

commit 747df19747bc9752cd40b9cce761e17a033aa5c2 upstream

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 <[email protected]>
Signed-off-by Mark Brown <[email protected]>
Cc [email protected]
Signed-off-by Sudip Mukherjee <[email protected]>
---
 sound/soc/codecs/sta32x.c | 3 +++
 1 file changed, 3 insertions(+)
sound/soc/codecs/sta32x.c +3 -0
index 5b888476d9ff..5002e9cc17a5 100644
@@ -879,6 +879,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->codec = codec;
+
 	ret = regulator_bulk_enable(ARRAY_SIZE(sta32x->supplies),
 				    sta32x->supplies);
 	if (ret != 0) {
Signature · 1 line
2.11.0
maintainer
#2 lore raw
Quoted 10 lines · Sudip Mukherjee
Quoted 5 lines · On Sun, Nov 11, 2018 at 06:29:26AM -0800, [email protected] wrote:

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

The attached backported patch will apply to 4.14-stable tree. But I will prefer to wait for Mark or Daniel to confirm that I have not done something foolish.

Should be fine from a quick scan.

#3 lore raw
In reply to Sudip Mukherjee
Quoted 10 lines · Sudip Mukherjee
Quoted 5 lines · On Sun, Nov 11, 2018 at 06:29:26AM -0800, [email protected] wrote:

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

The attached backported patch will apply to 4.14-stable tree. But I will prefer to wait for Mark or Daniel to confirm that I have not done something foolish.

Yes, LGTM.

Thanks!
Daniel

maintainer Applied
#4 lore raw
Quoted 8 lines · Daniel Mack
Quoted 7 lines · Sudip Mukherjee
Quoted 5 lines · On Sun, Nov 11, 2018 at 06:29:26AM -0800, [email protected] wrote:

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 5 lines
Quoted 3 lines

The attached backported patch will apply to 4.14-stable tree. But I will prefer to wait for Mark or Daniel to confirm that I have not done something foolish.

Yes, LGTM.

Queued for all but 3.18, thanks all.

--
Thanks,
Sasha

author maintainer
#5 lore raw
Quoted 9 lines · Sasha Levin
Quoted 8 lines · Daniel Mack
Quoted 7 lines · Sudip Mukherjee
Quoted 5 lines · On Sun, Nov 11, 2018 at 06:29:26AM -0800, [email protected] wrote:

The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines

The attached backported patch will apply to 4.14-stable tree. But I will prefer to wait for Mark or Daniel to confirm that I have not done something foolish.

Yes, LGTM.

Queued for all but 3.18, thanks all.

It breaks the build on 4.4 and 4.9, so I've dropped it from there :(

thanks,

greg k-h