2020-06-12 16:34:50

by Agrawal, Akshu

[permalink] [raw]
Subject: [PATCH] ASoC: rt5682: Register clocks even when mclk is NULL

Fixes kernel crash on platforms which do not have mclk exposed
in CCF framework. For these platforms have mclk as NULL and
continue to register clocks.

Signed-off-by: Akshu Agrawal <[email protected]>
---
sound/soc/codecs/rt5682.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sound/soc/codecs/rt5682.c b/sound/soc/codecs/rt5682.c
index d3245123101d..7c8b8d839db8 100644
--- a/sound/soc/codecs/rt5682.c
+++ b/sound/soc/codecs/rt5682.c
@@ -2829,12 +2829,11 @@ static int rt5682_probe(struct snd_soc_component *component)
return ret;
}
rt5682->mclk = NULL;
- } else {
- /* Register CCF DAI clock control */
- ret = rt5682_register_dai_clks(component);
- if (ret)
- return ret;
}
+ /* Register CCF DAI clock control */
+ ret = rt5682_register_dai_clks(component);
+ if (ret)
+ return ret;
/* Initial setup for CCF */
rt5682->lrck[RT5682_AIF1] = CLK_48;
#endif
--
2.20.1


2020-06-12 16:37:23

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] ASoC: rt5682: Register clocks even when mclk is NULL

On Fri, Jun 12, 2020 at 10:01:11PM +0530, Akshu Agrawal wrote:
> Fixes kernel crash on platforms which do not have mclk exposed
> in CCF framework. For these platforms have mclk as NULL and
> continue to register clocks.

Derek already submitted this:

https://lore.kernel.org/alsa-devel/[email protected]/T/#u

Attachments:
(No filename) (361.00 B)
 signature.asc (499.00 B)
 Download all attachments

2020-06-12 16:49:27

by Agrawal, Akshu

[permalink] [raw]
Subject: Re: [PATCH] ASoC: rt5682: Register clocks even when mclk is NULL


On 6/12/2020 10:04 PM, Mark Brown wrote:
> On Fri, Jun 12, 2020 at 10:01:11PM +0530, Akshu Agrawal wrote:
>> Fixes kernel crash on platforms which do not have mclk exposed
>> in CCF framework. For these platforms have mclk as NULL and
>> continue to register clocks.
> Derek already submitted this:
>
> https://lore.kernel.org/alsa-devel/[email protected]/T/#u

Ok great. Thanks.