From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Colin Ian King <colin.king@canonical.com>,
Takashi Iwai <tiwai@suse.de>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH AUTOSEL 3.18 07/15] ALSA: opl3: fix mismatch between snd_opl3_drum_switch definition and declaration
Date: Fri, 29 Mar 2019 20:57:22 -0400 [thread overview]
Message-ID: <20190330005730.28777-7-sashal@kernel.org> (raw)
In-Reply-To: <20190330005730.28777-1-sashal@kernel.org>
From: Colin Ian King <colin.king@canonical.com>
[ 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>
---
sound/drivers/opl3/opl3_voice.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
--
2.19.1
next prev parent reply other threads:[~2019-03-30 0:58 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-30 0:57 [PATCH AUTOSEL 3.18 01/15] perf/core: Restore mmap record type correctly Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 02/15] ext4: report real fs size after failed resize Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 03/15] ALSA: echoaudio: add a check for ioremap_nocache Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 04/15] ALSA: sb8: add a check for request_region Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 05/15] IB/mlx4: Fix race condition between catas error reset and aliasguid flows Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 06/15] mmc: davinci: remove extraneous __init annotation Sasha Levin
2019-03-30 0:57 ` Sasha Levin [this message]
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 08/15] thermal/int340x_thermal: fix mode setting Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 09/15] tools/power turbostat: return the exit status of a command Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 10/15] perf top: Fix error handling in cmd_top() Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 11/15] perf tests: Fix a memory leak in test__perf_evsel__tp_sched_test() Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 12/15] x86/hpet: Prevent potential NULL pointer dereference Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 13/15] x86/cpu/cyrix: Use correct macros for Cyrix calls on Geode processors Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 14/15] iommu/vt-d: Check capability before disabling protected memory Sasha Levin
2019-03-30 0:57 ` [PATCH AUTOSEL 3.18 15/15] fix incorrect error code mapping for OBJECTID_NOT_FOUND Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190330005730.28777-7-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=colin.king@canonical.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tiwai@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome