From 457f3c86d3358beb0ae19774fef8a9035dedd88f Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Sun, 9 Dec 2018 09:59:03 +0100
Subject: [PATCH] ALSA: hda/intel: Properly free the display power at error path
Git-commit: 457f3c86d3358beb0ae19774fef8a9035dedd88f
Patch-mainline: v5.0-rc1
References: bsc#1121278
When an error occurs in azx_probe_continue(), we should release the
display power. However, the current code ignores it and releases the
display power only for HSW/BDW cases. Fix it.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/pci/hda/hda_intel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 663e86effa1f..5399d0180434 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -2269,7 +2269,7 @@ static int azx_probe_continue(struct azx *chip)
pm_runtime_put_autosuspend(&pci->dev);
out_free:
- if (!hda->need_i915_power)
+ if (err < 0 || !hda->need_i915_power)
display_power(chip, false);
i915_power_fail:
--
2.20.1