| Message ID | 20230105093531.16960-1-tiwai@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] ALSA: hda: cs35l41: Don't return -EINVAL from system suspend/resume | expand |
On 05.01.23 10:35, Takashi Iwai wrote: > The recent commit to support the system suspend for CS35L41 caused a > regression on the models with CS35L41_EXT_BOOST_NO_VSPK_SWITC boost > type, as the suspend/resume callbacks just return -EINVAL. This is > eventually handled as a fatal error and blocks the whole system > suspend/resume. > > For avoiding the problem, this patch corrects the return code from > cs35l41_system_suspend() and _resume() to 0, and replace dev_err() > with dev_err_once() for stop spamming too much. > > Fixes: 88672826e2a4 ("ALSA: hda: cs35l41: Support System Suspend") > Cc: <stable@vger.kernel.org> Thx for taking care of that. > Link: https://lore.kernel.org/r/4262e3c4-6169-bbd2-e918-16b06f6994bc@protonmail.com Lore says "Not found". I wonder if it was a private mail later send again here: https://lore.kernel.org/all/e6751ac2-34f3-d13f-13db-8174fade8308@pm.me/ Ciao, Thorsten
On Thu, 05 Jan 2023 11:14:13 +0100, Thorsten Leemhuis wrote: > > On 05.01.23 10:35, Takashi Iwai wrote: > > The recent commit to support the system suspend for CS35L41 caused a > > regression on the models with CS35L41_EXT_BOOST_NO_VSPK_SWITC boost > > type, as the suspend/resume callbacks just return -EINVAL. This is > > eventually handled as a fatal error and blocks the whole system > > suspend/resume. > > > > For avoiding the problem, this patch corrects the return code from > > cs35l41_system_suspend() and _resume() to 0, and replace dev_err() > > with dev_err_once() for stop spamming too much. > > > > Fixes: 88672826e2a4 ("ALSA: hda: cs35l41: Support System Suspend") > > Cc: <stable@vger.kernel.org> > > Thx for taking care of that. > > > Link: https://lore.kernel.org/r/4262e3c4-6169-bbd2-e918-16b06f6994bc@protonmail.com > > Lore says "Not found". I wonder if it was a private mail later send > again here: > > https://lore.kernel.org/all/e6751ac2-34f3-d13f-13db-8174fade8308@pm.me/ Yeah, it looks so. I'll correct the URL at applying the patches. thanks, Takashi
diff --git a/sound/pci/hda/cs35l41_hda.c b/sound/pci/hda/cs35l41_hda.c index 91842c0c8c74..0a5cee730268 100644 --- a/sound/pci/hda/cs35l41_hda.c +++ b/sound/pci/hda/cs35l41_hda.c @@ -598,8 +598,8 @@ static int cs35l41_system_suspend(struct device *dev) dev_dbg(cs35l41->dev, "System Suspend\n"); if (cs35l41->hw_cfg.bst_type == CS35L41_EXT_BOOST_NO_VSPK_SWITCH) { - dev_err(cs35l41->dev, "System Suspend not supported\n"); - return -EINVAL; + dev_err_once(cs35l41->dev, "System Suspend not supported\n"); + return 0; /* don't block the whole system suspend */ } ret = pm_runtime_force_suspend(dev); @@ -624,8 +624,8 @@ static int cs35l41_system_resume(struct device *dev) dev_dbg(cs35l41->dev, "System Resume\n"); if (cs35l41->hw_cfg.bst_type == CS35L41_EXT_BOOST_NO_VSPK_SWITCH) { - dev_err(cs35l41->dev, "System Resume not supported\n"); - return -EINVAL; + dev_err_once(cs35l41->dev, "System Resume not supported\n"); + return 0; /* don't block the whole system resume */ } if (cs35l41->reset_gpio) {
The recent commit to support the system suspend for CS35L41 caused a regression on the models with CS35L41_EXT_BOOST_NO_VSPK_SWITC boost type, as the suspend/resume callbacks just return -EINVAL. This is eventually handled as a fatal error and blocks the whole system suspend/resume. For avoiding the problem, this patch corrects the return code from cs35l41_system_suspend() and _resume() to 0, and replace dev_err() with dev_err_once() for stop spamming too much. Fixes: 88672826e2a4 ("ALSA: hda: cs35l41: Support System Suspend") Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/4262e3c4-6169-bbd2-e918-16b06f6994bc@protonmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de> --- sound/pci/hda/cs35l41_hda.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)