diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-03-09 08:42:00 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-03-09 08:42:00 +0100 |
commit | 4aa01c408b7022c620241b373d4c3707a2ebeab6 (patch) | |
tree | 25df2a7453ec3bf7fc82f2871756b4efd6d3d283 /sound/drivers/opl3 | |
parent | 5371fc0ecdf55b6811ade8a198de8ace2f4e5861 (diff) | |
parent | a1f3f1ca66bd12c339b17a0c2ef93a093f90a277 (diff) | |
download | linux-4aa01c408b7022c620241b373d4c3707a2ebeab6.tar.gz linux-4aa01c408b7022c620241b373d4c3707a2ebeab6.tar.bz2 linux-4aa01c408b7022c620241b373d4c3707a2ebeab6.zip |
Merge branch 'for-linus' into for-next
Merging the HD-audio fixes back to base devel branch for further
working on it.
Diffstat (limited to 'sound/drivers/opl3')
-rw-r--r-- | sound/drivers/opl3/opl3_midi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c index f62780ed64ad..7821b07415a7 100644 --- a/sound/drivers/opl3/opl3_midi.c +++ b/sound/drivers/opl3/opl3_midi.c @@ -105,6 +105,8 @@ static void snd_opl3_calc_pitch(unsigned char *fnum, unsigned char *blocknum, int pitchbend = chan->midi_pitchbend; int segment; + if (pitchbend < -0x2000) + pitchbend = -0x2000; if (pitchbend > 0x1FFF) pitchbend = 0x1FFF; |