diff options
Diffstat (limited to 'sound/drivers/pcsp/pcsp_lib.c')
-rw-r--r-- | sound/drivers/pcsp/pcsp_lib.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/drivers/pcsp/pcsp_lib.c b/sound/drivers/pcsp/pcsp_lib.c index d77ffa9a9387..ce9e7d170c0d 100644 --- a/sound/drivers/pcsp/pcsp_lib.c +++ b/sound/drivers/pcsp/pcsp_lib.c | |||
@@ -66,7 +66,7 @@ static u64 pcsp_timer_update(struct snd_pcsp *chip) | |||
66 | timer_cnt = val * CUR_DIV() / 256; | 66 | timer_cnt = val * CUR_DIV() / 256; |
67 | 67 | ||
68 | if (timer_cnt && chip->enable) { | 68 | if (timer_cnt && chip->enable) { |
69 | spin_lock_irqsave(&i8253_lock, flags); | 69 | raw_spin_lock_irqsave(&i8253_lock, flags); |
70 | if (!nforce_wa) { | 70 | if (!nforce_wa) { |
71 | outb_p(chip->val61, 0x61); | 71 | outb_p(chip->val61, 0x61); |
72 | outb_p(timer_cnt, 0x42); | 72 | outb_p(timer_cnt, 0x42); |
@@ -75,7 +75,7 @@ static u64 pcsp_timer_update(struct snd_pcsp *chip) | |||
75 | outb(chip->val61 ^ 2, 0x61); | 75 | outb(chip->val61 ^ 2, 0x61); |
76 | chip->thalf = 1; | 76 | chip->thalf = 1; |
77 | } | 77 | } |
78 | spin_unlock_irqrestore(&i8253_lock, flags); | 78 | raw_spin_unlock_irqrestore(&i8253_lock, flags); |
79 | } | 79 | } |
80 | 80 | ||
81 | chip->ns_rem = PCSP_PERIOD_NS(); | 81 | chip->ns_rem = PCSP_PERIOD_NS(); |
@@ -159,10 +159,10 @@ static int pcsp_start_playing(struct snd_pcsp *chip) | |||
159 | return -EIO; | 159 | return -EIO; |
160 | } | 160 | } |
161 | 161 | ||
162 | spin_lock(&i8253_lock); | 162 | raw_spin_lock(&i8253_lock); |
163 | chip->val61 = inb(0x61) | 0x03; | 163 | chip->val61 = inb(0x61) | 0x03; |
164 | outb_p(0x92, 0x43); /* binary, mode 1, LSB only, ch 2 */ | 164 | outb_p(0x92, 0x43); /* binary, mode 1, LSB only, ch 2 */ |
165 | spin_unlock(&i8253_lock); | 165 | raw_spin_unlock(&i8253_lock); |
166 | atomic_set(&chip->timer_active, 1); | 166 | atomic_set(&chip->timer_active, 1); |
167 | chip->thalf = 0; | 167 | chip->thalf = 0; |
168 | 168 | ||
@@ -179,11 +179,11 @@ static void pcsp_stop_playing(struct snd_pcsp *chip) | |||
179 | return; | 179 | return; |
180 | 180 | ||
181 | atomic_set(&chip->timer_active, 0); | 181 | atomic_set(&chip->timer_active, 0); |
182 | spin_lock(&i8253_lock); | 182 | raw_spin_lock(&i8253_lock); |
183 | /* restore the timer */ | 183 | /* restore the timer */ |
184 | outb_p(0xb6, 0x43); /* binary, mode 3, LSB/MSB, ch 2 */ | 184 | outb_p(0xb6, 0x43); /* binary, mode 3, LSB/MSB, ch 2 */ |
185 | outb(chip->val61 & 0xFC, 0x61); | 185 | outb(chip->val61 & 0xFC, 0x61); |
186 | spin_unlock(&i8253_lock); | 186 | raw_spin_unlock(&i8253_lock); |
187 | } | 187 | } |
188 | 188 | ||
189 | /* | 189 | /* |