Message ID | 568F99DD.50809@parkeon.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Fri, Jan 8, 2016 at 9:13 AM, Martin Fuzzey <mfuzzey@parkeon.com> wrote: > I have that in my old 3.19 tree too so it's not new. > > I didn't submit it because I haven't investigated further to see if it was > just papering over the real problem.. Thanks, Martin. I moved this to the alsa list, so that we can discuss this issue there.
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index a1305f8..a7ddf69 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -584,6 +584,9 @@ int snd_soc_suspend(struct device *dev) if (!card->instantiated) return 0; + if (!card->snd_card) + return 0; + /* Due to the resume being scheduled into a workqueue we could * suspend before that's finished - wait for it to complete. */ @@ -814,6 +817,9 @@ int snd_soc_resume(struct device *dev) if (!card->instantiated) return 0; + if (!card->snd_card) + return 0; + /* activate pins from sleep state */