summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2019-03-17 23:21:24 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-04-27 09:30:27 +0200
commit80d182c2af80eaae729f158d766e422015a18d0a (patch)
treea21996fb005f998616cba2fe8e87b34f0a1c7af8
parent55a440ee396eaa7eac1c3631cca9ca1a0b062373 (diff)
downloadlinux-stable-80d182c2af80eaae729f158d766e422015a18d0a.tar.gz
linux-stable-80d182c2af80eaae729f158d766e422015a18d0a.tar.bz2
linux-stable-80d182c2af80eaae729f158d766e422015a18d0a.zip
ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration
[ Upstream commit b4748e7ab731e436cf5db4786358ada5dd2db6dd ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--sound/drivers/opl3/opl3_voice.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/opl3/opl3_voice.h b/sound/drivers/opl3/opl3_voice.h
index a371c075ac87..e26702559f61 100644
--- 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 data);
/* 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