summaryrefslogtreecommitdiff
path: root/sound/drivers/pcsp/pcsp_input.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-12-19 10:22:57 +0300
committerTakashi Iwai <tiwai@suse.de>2008-12-19 10:22:57 +0300
commit0ff555192a8d20385d49d1c420e2e8d409b3c0da (patch)
treeb6e4b6cae1028a310a3488ebf745954c51694bfc /sound/drivers/pcsp/pcsp_input.c
parent3218c178b41b420cb7e0d120c7a137a3969242e5 (diff)
parent9e43f0de690211cf7153b5f3ec251bc315647ada (diff)
downloadlinux-0ff555192a8d20385d49d1c420e2e8d409b3c0da.tar.xz
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'sound/drivers/pcsp/pcsp_input.c')
-rw-r--r--sound/drivers/pcsp/pcsp_input.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/drivers/pcsp/pcsp_input.c b/sound/drivers/pcsp/pcsp_input.c
index cd9b83e7f7d1..0444cdeb4bec 100644
--- a/sound/drivers/pcsp/pcsp_input.c
+++ b/sound/drivers/pcsp/pcsp_input.c
@@ -24,13 +24,13 @@ static void pcspkr_do_sound(unsigned int count)
spin_lock_irqsave(&i8253_lock, flags);
if (count) {
- /* enable counter 2 */
- outb_p(inb_p(0x61) | 3, 0x61);
/* set command for counter 2, 2 byte write */
outb_p(0xB6, 0x43);
/* select desired HZ */
outb_p(count & 0xff, 0x42);
outb((count >> 8) & 0xff, 0x42);
+ /* enable counter 2 */
+ outb_p(inb_p(0x61) | 3, 0x61);
} else {
/* disable counter 2 */
outb(inb_p(0x61) & 0xFC, 0x61);