Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-03-22 22:59:17 +0100
committerTakashi Iwai <tiwai@suse.de>2019-03-22 22:59:49 +0100
commit44777c32eaa52ae1995181b715bad6fe8752c7b6 (patch)
treeb4214640fa877003daab5f16bb5119f361c8008f
parenteb14dfb14c8f9a294ef2798ef930dfc5900ba622 (diff)
ALSA: opl3: fix mismatch between snd_opl3_drum_switch definitionSLE15
and declaration (bsc#1051510).
-rw-r--r--patches.drivers/ALSA-opl3-fix-mismatch-between-snd_opl3_drum_switch-.patch34
-rw-r--r--series.conf1
2 files changed, 35 insertions, 0 deletions
diff --git a/patches.drivers/ALSA-opl3-fix-mismatch-between-snd_opl3_drum_switch-.patch b/patches.drivers/ALSA-opl3-fix-mismatch-between-snd_opl3_drum_switch-.patch
new file mode 100644
index 0000000000..fe15500692
--- /dev/null
+++ b/patches.drivers/ALSA-opl3-fix-mismatch-between-snd_opl3_drum_switch-.patch
@@ -0,0 +1,34 @@
+From b4748e7ab731e436cf5db4786358ada5dd2db6dd Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Sun, 17 Mar 2019 23:21:24 +0000
+Subject: [PATCH] ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration
+Git-commit: b4748e7ab731e436cf5db4786358ada5dd2db6dd
+Patch-mainline: v5.1-rc2
+References: bsc#1051510
+
+The function snd_opl3_drum_switch declaration in the header file
+has the order of the two arguments on_off and vel swapped when
+compared to the definition arguments of vel and on_off. Fix this
+by swapping them around to match the definition.
+
+This error predates the git history, so no idea when this error
+was introduced.
+
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ sound/drivers/opl3/opl3_voice.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/drivers/opl3/opl3_voice.h
++++ b/sound/drivers/opl3/opl3_voice.h
+@@ -41,7 +41,7 @@ void snd_opl3_timer_func(unsigned long d
+
+ /* Prototypes for opl3_drums.c */
+ void snd_opl3_load_drums(struct snd_opl3 *opl3);
+-void snd_opl3_drum_switch(struct snd_opl3 *opl3, int note, int on_off, int vel, struct snd_midi_channel *chan);
++void snd_opl3_drum_switch(struct snd_opl3 *opl3, int note, int vel, int on_off, struct snd_midi_channel *chan);
+
+ /* Prototypes for opl3_oss.c */
+ #ifdef CONFIG_SND_SEQUENCER_OSS
diff --git a/series.conf b/series.conf
index b60e7d2d08..cccbc7d693 100644
--- a/series.conf
+++ b/series.conf
@@ -20973,6 +20973,7 @@
patches.drivers/ALSA-sb8-add-a-check-for-request_region.patch
patches.drivers/ALSA-firewire-motu-use-version-field-of-unit-directo.patch
patches.drivers/ALSA-hda-add-Lenovo-IdeaCentre-B550-to-the-power_sav.patch
+ patches.drivers/ALSA-opl3-fix-mismatch-between-snd_opl3_drum_switch-.patch
# davem/net-next
patches.drivers/ibmvnic-Report-actual-backing-device-speed-and-duple.patch