releases/4.9.170/alsa-opl3-fix-mismatch-between-snd_opl3_drum_switch-.patch

   1 From 8a1576e9fb7413e7d08157fa0714734f608ab348 Mon Sep 17 00:00:00 2001
   2 From: Colin Ian King <colin.king@canonical.com>
   3 Date: Sun, 17 Mar 2019 23:21:24 +0000
   4 Subject: ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and
   5  declaration
   6
   7 [ Upstream commit b4748e7ab731e436cf5db4786358ada5dd2db6dd ]
   8
   9 The function snd_opl3_drum_switch declaration in the header file
  10 has the order of the two arguments on_off and vel swapped when
  11 compared to the definition arguments of vel and on_off.  Fix this
  12 by swapping them around to match the definition.
  13
  14 This error predates the git history, so no idea when this error
  15 was introduced.
  16
  17 Signed-off-by: Colin Ian King <colin.king@canonical.com>
  18 Signed-off-by: Takashi Iwai <tiwai@suse.de>
  19 Signed-off-by: Sasha Levin <sashal@kernel.org>
  20 ---
  21  sound/drivers/opl3/opl3_voice.h | 2 +-
  22  1 file changed, 1 insertion(+), 1 deletion(-)
  23
  24 diff --git a/sound/drivers/opl3/opl3_voice.h b/sound/drivers/opl3/opl3_voice.h
  25 index a371c075ac87..e26702559f61 100644
  26 --- a/sound/drivers/opl3/opl3_voice.h
  27 +++ b/sound/drivers/opl3/opl3_voice.h
  28 @@ -41,7 +41,7 @@ void snd_opl3_timer_func(unsigned long data);
  29
  30  /* Prototypes for opl3_drums.c */
  31  void snd_opl3_load_drums(struct snd_opl3 *opl3);
  32 -void snd_opl3_drum_switch(struct snd_opl3 *opl3, int note, int on_off, int vel, struct snd_midi_channel *chan);
  33 +void snd_opl3_drum_switch(struct snd_opl3 *opl3, int note, int vel, int on_off, struct snd_midi_channel *chan);
  34
  35  /* Prototypes for opl3_oss.c */
  36  #ifdef CONFIG_SND_SEQUENCER_OSS
  37 --
  38 2.19.1
  39