projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e454ff8
)
ALSA: hda/intel: Properly free the display power at error path
author
Takashi Iwai
<tiwai@suse.de>
Sun, 9 Dec 2018 08:59:03 +0000
(09:59 +0100)
committer
Takashi Iwai
<tiwai@suse.de>
Tue, 11 Dec 2018 07:15:45 +0000
(08:15 +0100)
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
patch
|
blob
|
history
diff --git
a/sound/pci/hda/hda_intel.c
b/sound/pci/hda/hda_intel.c
index
663e86e
..
5399d01
100644
(file)
--- 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: