summaryrefslogtreecommitdiff
path: root/sound/oss
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 16:48:19 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-18 16:48:19 -0700
commit01da47059ab54544a508b217598fb0e73b73e7a8 (patch)
treeccedb10f7d966361e569a3249a1db7209d6faba5 /sound/oss
parent61d718076e95eb461fd4c3692b702a82e2be0df4 (diff)
parente04dd2d21bb70dd707d569d4ac843149b9acfb27 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: sound: sequencer: clean up remove bogus check ALSA: hda: Use LPIB and 6stack-dig for eMachines T5212 ALSA: hda - Disable MSI for Nvidia controller ALSA: hda - Add PCI quirks for MSI NetOn AP1900 and Wind Top AE2220 ALSA: hda - Fix secondary ADC of ALC260 basic model ALSA: hda - Add an error message for invalid mapping NID ALSA: hda - New Intel HDA controller
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/sequencer.c2
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,
}
semitones = bend / 100;
- if (semitones > 99)
- semitones = 99;
cents = bend % 100;
amount = (int) (semitone_tuning[semitones] * multiplier * cent_tuning[cents]) / 10000;