Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-19 14:22:05 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-19 14:34:28 +0200
commitb68c02d3f76d94ec46ccd5fac019d02edfde226c (patch)
treec0450b12085c0f1740a49f6823ef32e74d038ef2
parentb8b1a5d5ac69444a442e3bbd19fdf8c6e0397fab (diff)
kABI fix for hda_codec.relaxed_resume flag (bsc#1111666).
-rw-r--r--patches.kabi/hda-relaxed_resume-flag-kabi-fix.patch28
-rw-r--r--series.conf1
2 files changed, 29 insertions, 0 deletions
diff --git a/patches.kabi/hda-relaxed_resume-flag-kabi-fix.patch b/patches.kabi/hda-relaxed_resume-flag-kabi-fix.patch
new file mode 100644
index 0000000000..0ff011bc2a
--- /dev/null
+++ b/patches.kabi/hda-relaxed_resume-flag-kabi-fix.patch
@@ -0,0 +1,28 @@
+From: Takashi Iwai <tiwai@suse.de>
+Subject: kABI fix for hda_codec.relaxed_resume flag
+Patch-mainline: Never, kABI workaround
+References: bsc#1111666
+
+The recent fix
+ ALSA-hda-Don-t-resume-forcibly-i915-HDMI-DP-codec.patch
+introduced a new bit flag to hda_codec object, and we need to wrap it
+with the usual ifdef for kABI compatibility.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ include/sound/hda_codec.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/include/sound/hda_codec.h
++++ b/include/sound/hda_codec.h
+@@ -262,7 +262,9 @@ struct hda_codec {
+ unsigned int auto_runtime_pm:1; /* enable automatic codec runtime pm */
+ unsigned int force_pin_prefix:1; /* Add location prefix */
+ unsigned int link_down_at_suspend:1; /* link down at runtime suspend */
++#ifndef __GENKSYMS__
+ unsigned int relaxed_resume:1; /* don't resume forcibly for jack */
++#endif
+
+ #ifdef CONFIG_PM
+ unsigned long power_on_acct;
diff --git a/series.conf b/series.conf
index 3f6ed822e5..213665d294 100644
--- a/series.conf
+++ b/series.conf
@@ -48501,6 +48501,7 @@
##########################################################
# Sound
##########################################################
+ patches.kabi/hda-relaxed_resume-flag-kabi-fix.patch
########################################################
# printk