diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-03-17 04:01:33 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-03-17 04:01:33 -0400 |
| commit | 2a5e00ed14e27908dae698900473a65cc53ccd82 (patch) | |
| tree | f4678b819f41dbd16ea95a7208f9ffa73323a90e /sound | |
| parent | 0e49887703015dd73667664c5abc9a6366641da9 (diff) | |
| parent | fb40b496ad8bbe60a60c25eb2fce20f3cc114679 (diff) | |
Merge branch 'fix/misc' into for-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/oss/sequencer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c index c79874696be..e85789e5381 100644 --- a/sound/oss/sequencer.c +++ b/sound/oss/sequencer.c | |||
| @@ -1631,8 +1631,6 @@ unsigned long compute_finetune(unsigned long base_freq, int bend, int range, | |||
| 1631 | } | 1631 | } |
| 1632 | 1632 | ||
| 1633 | semitones = bend / 100; | 1633 | semitones = bend / 100; |
| 1634 | if (semitones > 99) | ||
| 1635 | semitones = 99; | ||
| 1636 | cents = bend % 100; | 1634 | cents = bend % 100; |
| 1637 | 1635 | ||
| 1638 | amount = (int) (semitone_tuning[semitones] * multiplier * cent_tuning[cents]) / 10000; | 1636 | amount = (int) (semitone_tuning[semitones] * multiplier * cent_tuning[cents]) / 10000; |