diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 07:17:26 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 07:17:26 -0400 |
| commit | f9b44121b34174ae4f243a568393fc3225842e75 (patch) | |
| tree | 943f68cd7458d08a9e8809ed0a10b71b23911f3e /sound/oss/sequencer.c | |
| parent | 8727b909bb2348d29e62c599cd7a5d610da3760f (diff) | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
Merge commit 'v2.6.34-rc2' into for-2.6.34
Diffstat (limited to 'sound/oss/sequencer.c')
| -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 c79874696bec..e85789e53816 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; |