summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorColin Ian King <colin.i.king@gmail.com>2021-12-12 17:20:25 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-12-29 12:20:46 +0100
commit9f8daff52b344d729ccecce07df66e2aad33a76a (patch)
tree813649351fd7a64b7b53de61fde63722fc6f7bfb /sound
parent86e1ad26cb4b93ac5061d3fdbdc459b4e6561f9d (diff)
downloadlinux-stable-9f8daff52b344d729ccecce07df66e2aad33a76a.tar.gz
linux-stable-9f8daff52b344d729ccecce07df66e2aad33a76a.tar.bz2
linux-stable-9f8daff52b344d729ccecce07df66e2aad33a76a.zip
ALSA: drivers: opl3: Fix incorrect use of vp->state
commit 2dee54b289fbc810669a1b2b8a0887fa1c9a14d7 upstream. Static analysis with scan-build has found an assignment to vp2 that is never used. It seems that the check on vp->state > 0 should be actually on vp2->state instead. Fix this. This dates back to 2002, I found the offending commit from the git history git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git, commit 91e39521bbf6 ("[PATCH] ALSA patch for 2.5.4") Signed-off-by: Colin Ian King <colin.i.king@gmail.com> Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20211212172025.470367-1-colin.i.king@gmail.com Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/drivers/opl3/opl3_midi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c
index a33cb744e96c..4e77b1dcacc8 100644
--- a/sound/drivers/opl3/opl3_midi.c
+++ b/sound/drivers/opl3/opl3_midi.c
@@ -412,7 +412,7 @@ void snd_opl3_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)
}
if (instr_4op) {
vp2 = &opl3->voices[voice + 3];
- if (vp->state > 0) {
+ if (vp2->state > 0) {
opl3_reg = reg_side | (OPL3_REG_KEYON_BLOCK +
voice_offset + 3);
reg_val = vp->keyon_reg & ~OPL3_KEYON_BIT;