* FAILED: patch "[PATCH] ASoC: sta32x: set ->component pointer in private struct" failed to apply to 4.14-stable tree
@ 2018-11-11 14:29 gregkh
2018-12-20 21:48 ` Sudip Mukherjee
0 siblings, 1 reply; 6+ messages in thread
From: gregkh @ 2018-11-11 14:29 UTC (permalink / raw)
To: daniel, broonie; +Cc: stable
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 <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 747df19747bc9752cd40b9cce761e17a033aa5c2 Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@zonque.org>
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 <daniel@zonque.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index d5035f2f2b2b..ce508b4cc85c 100644
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -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) {
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: FAILED: patch "[PATCH] ASoC: sta32x: set ->component pointer in private struct" failed to apply to 4.14-stable tree
2018-11-11 14:29 FAILED: patch "[PATCH] ASoC: sta32x: set ->component pointer in private struct" failed to apply to 4.14-stable tree gregkh
@ 2018-12-20 21:48 ` Sudip Mukherjee
2018-12-21 10:58 ` Mark Brown
2018-12-21 13:10 ` Daniel Mack
0 siblings, 2 replies; 6+ messages in thread
From: Sudip Mukherjee @ 2018-12-20 21:48 UTC (permalink / raw)
To: gregkh, Daniel Mack, Mark Brown; +Cc: daniel, broonie, stable
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
On Sun, Nov 11, 2018 at 06:29:26AM -0800, gregkh@linuxfoundation.org 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 <stable@vger.kernel.org>.
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
[-- Attachment #2: 0001-ASoC-sta32x-set-component-pointer-in-private-struct.patch --]
[-- Type: text/x-diff, Size: 1409 bytes --]
>From 8a3172ca525a0a990ddd739c8969129eaaad859f Mon Sep 17 00:00:00 2001
From: Daniel Mack <daniel@zonque.org>
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 <daniel@zonque.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
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 5b888476d9ff..5002e9cc17a5 100644
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -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) {
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: FAILED: patch "[PATCH] ASoC: sta32x: set ->component pointer in private struct" failed to apply to 4.14-stable tree
2018-12-20 21:48 ` Sudip Mukherjee
@ 2018-12-21 10:58 ` Mark Brown
2018-12-21 13:10 ` Daniel Mack
1 sibling, 0 replies; 6+ messages in thread
From: Mark Brown @ 2018-12-21 10:58 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: gregkh, Daniel Mack, stable
[-- Attachment #1: Type: text/plain, Size: 609 bytes --]
On Thu, Dec 20, 2018 at 09:48:09PM +0000, Sudip Mukherjee wrote:
> On Sun, Nov 11, 2018 at 06:29:26AM -0800, gregkh@linuxfoundation.org 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 <stable@vger.kernel.org>.
>
> 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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: FAILED: patch "[PATCH] ASoC: sta32x: set ->component pointer in private struct" failed to apply to 4.14-stable tree
2018-12-20 21:48 ` Sudip Mukherjee
2018-12-21 10:58 ` Mark Brown
@ 2018-12-21 13:10 ` Daniel Mack
2018-12-21 23:24 ` Sasha Levin
1 sibling, 1 reply; 6+ messages in thread
From: Daniel Mack @ 2018-12-21 13:10 UTC (permalink / raw)
To: Sudip Mukherjee, gregkh, Mark Brown; +Cc: stable
On 20/12/2018 10:48 PM, Sudip Mukherjee wrote:
> On Sun, Nov 11, 2018 at 06:29:26AM -0800, gregkh@linuxfoundation.org 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 <stable@vger.kernel.org>.
>
> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: FAILED: patch "[PATCH] ASoC: sta32x: set ->component pointer in private struct" failed to apply to 4.14-stable tree
2018-12-21 13:10 ` Daniel Mack
@ 2018-12-21 23:24 ` Sasha Levin
2018-12-23 12:02 ` Greg KH
0 siblings, 1 reply; 6+ messages in thread
From: Sasha Levin @ 2018-12-21 23:24 UTC (permalink / raw)
To: Daniel Mack; +Cc: Sudip Mukherjee, gregkh, Mark Brown, stable
On Fri, Dec 21, 2018 at 02:10:39PM +0100, Daniel Mack wrote:
>On 20/12/2018 10:48 PM, Sudip Mukherjee wrote:
>> On Sun, Nov 11, 2018 at 06:29:26AM -0800, gregkh@linuxfoundation.org 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 <stable@vger.kernel.org>.
>>
>> 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: FAILED: patch "[PATCH] ASoC: sta32x: set ->component pointer in private struct" failed to apply to 4.14-stable tree
2018-12-21 23:24 ` Sasha Levin
@ 2018-12-23 12:02 ` Greg KH
0 siblings, 0 replies; 6+ messages in thread
From: Greg KH @ 2018-12-23 12:02 UTC (permalink / raw)
To: Sasha Levin; +Cc: Daniel Mack, Sudip Mukherjee, Mark Brown, stable
On Fri, Dec 21, 2018 at 06:24:58PM -0500, Sasha Levin wrote:
> On Fri, Dec 21, 2018 at 02:10:39PM +0100, Daniel Mack wrote:
> > On 20/12/2018 10:48 PM, Sudip Mukherjee wrote:
> > > On Sun, Nov 11, 2018 at 06:29:26AM -0800, gregkh@linuxfoundation.org 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 <stable@vger.kernel.org>.
> > >
> > > 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
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-12-23 12:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-11 14:29 FAILED: patch "[PATCH] ASoC: sta32x: set ->component pointer in private struct" failed to apply to 4.14-stable tree gregkh
2018-12-20 21:48 ` Sudip Mukherjee
2018-12-21 10:58 ` Mark Brown
2018-12-21 13:10 ` Daniel Mack
2018-12-21 23:24 ` Sasha Levin
2018-12-23 12:02 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).