Merge branch 'for-linus' into for-next

Merging the HD-audio fixes back to base devel branch for further
working on it.
This commit is contained in:
Takashi Iwai 2015-03-09 08:42:00 +01:00
commit 4aa01c408b
325 changed files with 3546 additions and 1945 deletions

View file

@ -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;