| Message ID | 20211212172025.470367-1-colin.i.king@gmail.com |
|---|---|
| State | Accepted |
| Commit | 2dee54b289fbc810669a1b2b8a0887fa1c9a14d7 |
| Headers | show |
| Series | ALSA: drivers: opl3: Fix incorrect use of vp->state | expand |
On Sun, 12 Dec 2021 18:20:25 +0100, Colin Ian King wrote: > > 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> Thanks, applied now with Cc-to-stable. Takashi
diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c index e1b69c65c3c8..e2b7be67f0e3 100644 --- a/sound/drivers/opl3/opl3_midi.c +++ b/sound/drivers/opl3/opl3_midi.c @@ -397,7 +397,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;
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> --- sound/drivers/opl3/opl3_midi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)