summaryrefslogtreecommitdiffstats
path: root/sound/drivers
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-20 09:15:00 +0200
commit4467b4fdad62644814f13417b6fd54546db6a7ae (patch)
tree815a2365139ea24c63024ab172c8685fa510d0a2 /sound/drivers
parenteebec30d6b7ae4d60b1002e4dc31ffec38a0d4a5 (diff)
downloadlinux-stable-4467b4fdad62644814f13417b6fd54546db6a7ae.tar.gz
linux-stable-4467b4fdad62644814f13417b6fd54546db6a7ae.tar.bz2
linux-stable-4467b4fdad62644814f13417b6fd54546db6a7ae.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>
Diffstat (limited to 'sound/drivers')
-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 eaef435e0528..abf6c23a721c 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 */
#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)