diff mbox series

[1/1] Revert "ALSA: hda: call runtime_allow() for all hda controllers"

Message ID 20200928065203.5964-2-kai.heng.feng@canonical.com
State New
Headers show
Series Fix headset jack detection on Dell UFF desktops | expand

Commit Message

Kai-Heng Feng Sept. 28, 2020, 6:52 a.m. UTC 
From: Hui Wang <hui.wang@canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1897508

This reverts commit 9a6418487b56 ("ALSA: hda: call runtime_allow()
for all hda controllers").

The reverted patch already introduced some regressions on some
machines:
 - on gemini-lake machines, the error of "azx_get_response timeout"
   happens in the hda driver.
 - on the machines with alc662 codec, the audio jack detection doesn't
   work anymore.

Fixes: 9a6418487b56 ("ALSA: hda: call runtime_allow() for all hda controllers")
BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=208511
Cc: <stable@vger.kernel.org>
Signed-off-by: Hui Wang <hui.wang@canonical.com>
Link: https://lore.kernel.org/r/20200803064638.6139-1-hui.wang@canonical.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
(cherry picked from commit 07c9983b567d0ef33aefc063299de95a987e12a8)
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 sound/pci/hda/hda_intel.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Kleber Sacilotto de Souza Oct. 6, 2020, 7:57 a.m. UTC | #1 
On 28.09.20 08:52, Kai-Heng Feng wrote:
> From: Hui Wang <hui.wang@canonical.com>
> 
> BugLink: https://bugs.launchpad.net/bugs/1897508
> 
> This reverts commit 9a6418487b56 ("ALSA: hda: call runtime_allow()
> for all hda controllers").
> 
> The reverted patch already introduced some regressions on some
> machines:
>  - on gemini-lake machines, the error of "azx_get_response timeout"
>    happens in the hda driver.
>  - on the machines with alc662 codec, the audio jack detection doesn't
>    work anymore.
> 
> Fixes: 9a6418487b56 ("ALSA: hda: call runtime_allow() for all hda controllers")
> BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=208511
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Hui Wang <hui.wang@canonical.com>
> Link: https://lore.kernel.org/r/20200803064638.6139-1-hui.wang@canonical.com
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> (cherry picked from commit 07c9983b567d0ef33aefc063299de95a987e12a8)
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>

Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

> ---
>  sound/pci/hda/hda_intel.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
> index 29da0b03b895..a14dff82b6d5 100644
> --- a/sound/pci/hda/hda_intel.c
> +++ b/sound/pci/hda/hda_intel.c
> @@ -2340,7 +2340,6 @@ static int azx_probe_continue(struct azx *chip)
>  
>  	if (azx_has_pm_runtime(chip)) {
>  		pm_runtime_use_autosuspend(&pci->dev);
> -		pm_runtime_allow(&pci->dev);
>  		pm_runtime_put_autosuspend(&pci->dev);
>  	}
>  
>
diff mbox series

Patch

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 29da0b03b895..a14dff82b6d5 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2340,7 +2340,6 @@  static int azx_probe_continue(struct azx *chip)
 
 	if (azx_has_pm_runtime(chip)) {
 		pm_runtime_use_autosuspend(&pci->dev);
-		pm_runtime_allow(&pci->dev);
 		pm_runtime_put_autosuspend(&pci->dev);
 	}