diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-09 18:48:38 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-09 18:48:38 +0200 |
| commit | 305355aad89f1b7eb27cb210fad2f9d3c67b2572 (patch) | |
| tree | b7510300fae4fd06a29b2d773fb841e4ca3c8956 /sound/pci/hda/hda_beep.c | |
| parent | b1e4422f96a9b4830ffd8119b05211abb830ef4a (diff) | |
| parent | 005b10769c05fb16db70f7689ffb5ba17e3fc324 (diff) | |
| download | kernel_samsung_smdk4412-305355aad89f1b7eb27cb210fad2f9d3c67b2572.zip kernel_samsung_smdk4412-305355aad89f1b7eb27cb210fad2f9d3c67b2572.tar.gz kernel_samsung_smdk4412-305355aad89f1b7eb27cb210fad2f9d3c67b2572.tar.bz2 | |
Merge branch 'fix/hda' into topic/hda
Conflicts:
sound/pci/hda/patch_realtek.c
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_beep.c')
| -rw-r--r-- | sound/pci/hda/hda_beep.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c index 08fe659..3f51a98 100644 --- a/sound/pci/hda/hda_beep.c +++ b/sound/pci/hda/hda_beep.c @@ -51,19 +51,22 @@ static void snd_hda_generate_beep(struct work_struct *work) * The tone frequency of beep generator on IDT/STAC codecs is * defined from the 8bit tone parameter, in Hz, * freq = 48000 * (257 - tone) / 1024 - * that is from 12kHz to 93.75kHz in step of 46.875 hz + * that is from 12kHz to 93.75Hz in steps of 46.875 Hz */ static int beep_linear_tone(struct hda_beep *beep, int hz) { + if (hz <= 0) + return 0; hz *= 1000; /* fixed point */ - hz = hz - DIGBEEP_HZ_MIN; + hz = hz - DIGBEEP_HZ_MIN + + DIGBEEP_HZ_STEP / 2; /* round to nearest step */ if (hz < 0) hz = 0; /* turn off PC beep*/ else if (hz >= (DIGBEEP_HZ_MAX - DIGBEEP_HZ_MIN)) - hz = 0xff; + hz = 1; /* max frequency */ else { hz /= DIGBEEP_HZ_STEP; - hz++; + hz = 255 - hz; } return hz; } |