diff options
| author | Brian Norris <briannorris@chromium.org> | 2017-12-15 20:07:23 -0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-12-19 11:08:03 +0000 |
| commit | 20220945b1a8e77c789dd4bb9aa1471b6e8695cc (patch) | |
| tree | 7a05788bd86e923bdf26a28dfa2ffe812769ca86 /sound/soc | |
| parent | 346cccf88319344c9f513bd85df6ae2258e8a8ea (diff) | |
| download | linux-20220945b1a8e77c789dd4bb9aa1471b6e8695cc.tar.gz linux-20220945b1a8e77c789dd4bb9aa1471b6e8695cc.tar.bz2 linux-20220945b1a8e77c789dd4bb9aa1471b6e8695cc.zip | |
ASoC: rt5514-spi: only enable wakeup when fully initialized
If an rt5514-spi device is probed but the platform hasn't linked it in,
we might never fully request the SPI IRQ, nor configure the rt5514 DSP,
but we still might try to enable the SPI IRQ (enable_irq_wake()). This
is bad, and among other things, can cause the interrupt to trigger every
time we try to suspend the system (e.g., because the interrupt trigger
setting was never set properly).
Instead of setting our wakeup capabilities in the SPI driver probe
routine, let's wait until we've actually requested the IRQ.
Fixes issues seen on the "kevin" Chromebook (Samsung Chromebook Plus).
Fixes: 58f1c07d23cd ("ASoC: rt5514: Voice wakeup support.")
Signed-off-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/rt5514-spi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c index ca6a90d8fc39..64bf26cec20d 100644 --- a/sound/soc/codecs/rt5514-spi.c +++ b/sound/soc/codecs/rt5514-spi.c @@ -289,6 +289,8 @@ static int rt5514_spi_pcm_probe(struct snd_soc_platform *platform) dev_err(&rt5514_spi->dev, "%s Failed to reguest IRQ: %d\n", __func__, ret); + else + device_init_wakeup(rt5514_dsp->dev, true); } return 0; @@ -456,8 +458,6 @@ static int rt5514_spi_probe(struct spi_device *spi) return ret; } - device_init_wakeup(&spi->dev, true); - return 0; } |