From: Takashi Iwai <tiwai@suse.de>
Date: Sun, 9 Dec 2018 08:59:03 +0000 (+0100)
Subject: ALSA: hda/intel: Properly free the display power at error path
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=457f3c86d3358beb0ae19774fef8a9035dedd88f;p=openwrt%2Fstaging%2Fblogic.git

ALSA: hda/intel: Properly free the display power at error path

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>
---

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: