Home Home > GIT Browse > SLE15-SP1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-19 14:20:49 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-19 14:34:28 +0200
commit4cde8f21bb32a92b17f301407fb307dedeb3a7a9 (patch)
tree38c752a9beb0c47f8a221cfdc85b5fd6d831ebb1
parenteecf2f8f3856f7006e03403510365e256a45e7fa (diff)
ALSA: hda/hdmi - Remove duplicated define (bsc#1111666).
-rw-r--r--patches.drivers/ALSA-hda-hdmi-Remove-duplicated-define.patch34
-rw-r--r--series.conf1
2 files changed, 35 insertions, 0 deletions
diff --git a/patches.drivers/ALSA-hda-hdmi-Remove-duplicated-define.patch b/patches.drivers/ALSA-hda-hdmi-Remove-duplicated-define.patch
new file mode 100644
index 0000000000..21dbd0d2ac
--- /dev/null
+++ b/patches.drivers/ALSA-hda-hdmi-Remove-duplicated-define.patch
@@ -0,0 +1,34 @@
+From eb4177116bf568a413c544eca3f4446cb4064be9 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Mon, 15 Jul 2019 23:12:13 +0200
+Subject: [PATCH] ALSA: hda/hdmi - Remove duplicated define
+Git-commit: eb4177116bf568a413c544eca3f4446cb4064be9
+Patch-mainline: v5.3-rc1
+References: bsc#1111666
+
+INTEL_GET_VENDOR_VERB is defined twice identically.
+Let's remove a superfluous line.
+
+Fixes: b0d8bc50b9f2 ("ALSA: hda: hdmi - add Icelake support")
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/pci/hda/patch_hdmi.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
+index 40323d91f9e4..1e6c489bca15 100644
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -2416,7 +2416,6 @@ static void intel_haswell_fixup_connect_list(struct hda_codec *codec,
+ snd_hda_override_conn_list(codec, nid, spec->num_cvts, spec->cvt_nids);
+ }
+
+-#define INTEL_GET_VENDOR_VERB 0xf81
+ #define INTEL_GET_VENDOR_VERB 0xf81
+ #define INTEL_SET_VENDOR_VERB 0x781
+ #define INTEL_EN_DP12 0x02 /* enable DP 1.2 features */
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index 5c40bc96b8..e81bd88077 100644
--- a/series.conf
+++ b/series.conf
@@ -47894,6 +47894,7 @@
patches.drivers/PCI-Return-error-if-cannot-probe-VF.patch
patches.drivers/PCI-Always-allow-probing-with-driver_override.patch
patches.fixes/PCI-P2PDMA-Fix-missing-check-for-dma_virt_ops.patch
+ patches.drivers/ALSA-hda-hdmi-Remove-duplicated-define.patch
# davem/net-next
patches.drivers/cxgb4-Enable-hash-filter-with-offload.patch