Patch

Download

patch@alsa-project.org

November 2019

1 participants
2 discussions

Re: [ALSA patch] [alsa-devel] [PATCH] ASoC: rt274: Disable jack report IRQ with disabling jack
by Harlozinski, Pawel 13 Nov '19

13 Nov '19

On 11/12/2019 6:10 PM, Mark Brown wrote: > On Tue, Nov 12, 2019 at 02:02:37PM +0100, Pawel Harlozinski wrote: > >> /* Disable jack detection */ >> regmap_update_bits(rt274->regmap, RT274_EAPD_GPIO_IRQ_CTRL, >> RT274_IRQ_EN, RT274_IRQ_DIS); >> - >> + disable_irq(rt274->i2c->irq); >> return 0; > Shouldn't the register update above be suppressing interrupts? For rt274 disable_irq is also needed, otherwise we're getting flood of irq's in case of not loaded machine board. > disable_irq() is a bit of a hammer and interferes with things like > possible share use. This irq should be handled in codec code anyway - control of jack detect events from non-codec code is done with set_jack. Similar solutions for jack report irq enable/disable flow are implemented in rt5640 and rt5651. > _______________________________________________ > Alsa-devel mailing list > Alsa-devel(a)alsa-project.org > https://mailman.alsa-project.org/mailman/listinfo/alsa-devel

1 0

[PATCH] ASoC: Jack: Fix NULL pointer dereference in snd_soc_jack_report
by Pawel Harlozinski 12 Nov '19

12 Nov '19

Check for existance of jack before tracing. NULL pointer dereference has been reported by KASAN while unloading machine driver (snd_soc_cnl_rt274). Signed-off-by: Pawel Harlozinski <pawel.harlozinski(a)linux.intel.com> --- sound/soc/soc-jack.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/soc-jack.c b/sound/soc/soc-jack.c index a71d2340eb05..b5748dcd490f 100644 --- a/sound/soc/soc-jack.c +++ b/sound/soc/soc-jack.c @@ -82,10 +82,9 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask) unsigned int sync = 0; int enable; - trace_snd_soc_jack_report(jack, mask, status); - if (!jack) return; + trace_snd_soc_jack_report(jack, mask, status); dapm = &jack->card->dapm; -- 2.17.1

1 1