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 e1145ac6e908..f6a2e72b8cde 100644 --- a/sound/drivers/pcsp/pcsp_lib.c +++ b/sound/drivers/pcsp/pcsp_lib.c | |||
@@ -65,7 +65,7 @@ static u64 pcsp_timer_update(struct snd_pcsp *chip) | |||
65 | timer_cnt = val * CUR_DIV() / 256; | 65 | timer_cnt = val * CUR_DIV() / 256; |
66 | 66 | ||
67 | if (timer_cnt && chip->enable) { | 67 | if (timer_cnt && chip->enable) { |
68 | spin_lock_irqsave(&i8253_lock, flags); | 68 | raw_spin_lock_irqsave(&i8253_lock, flags); |
69 | if (!nforce_wa) { | 69 | if (!nforce_wa) { |
70 | outb_p(chip->val61, 0x61); | 70 | outb_p(chip->val61, 0x61); |
71 | outb_p(timer_cnt, 0x42); | 71 | outb_p(timer_cnt, 0x42); |
@@ -74,7 +74,7 @@ static u64 pcsp_timer_update(struct snd_pcsp *chip) | |||
74 | outb(chip->val61 ^ 2, 0x61); | 74 | outb(chip->val61 ^ 2, 0x61); |
75 | chip->thalf = 1; | 75 | chip->thalf = 1; |
76 | } | 76 | } |
77 | spin_unlock_irqrestore(&i8253_lock, flags); | 77 | raw_spin_unlock_irqrestore(&i8253_lock, flags); |
78 | } | 78 | } |
79 | 79 | ||
80 | chip->ns_rem = PCSP_PERIOD_NS(); | 80 | chip->ns_rem = PCSP_PERIOD_NS(); |
@@ -158,10 +158,10 @@ static int pcsp_start_playing(struct snd_pcsp *chip) | |||
158 | return -EIO; | 158 | return -EIO; |
159 | } | 159 | } |
160 | 160 | ||
161 | spin_lock(&i8253_lock); | 161 | raw_spin_lock(&i8253_lock); |
162 | chip->val61 = inb(0x61) | 0x03; | 162 | chip->val61 = inb(0x61) | 0x03; |
163 | outb_p(0x92, 0x43); /* binary, mode 1, LSB only, ch 2 */ | 163 | outb_p(0x92, 0x43); /* binary, mode 1, LSB only, ch 2 */ |
164 | spin_unlock(&i8253_lock); | 164 | raw_spin_unlock(&i8253_lock); |
165 | atomic_set(&chip->timer_active, 1); | 165 | atomic_set(&chip->timer_active, 1); |
166 | chip->thalf = 0; | 166 | chip->thalf = 0; |
167 | 167 | ||
@@ -178,11 +178,11 @@ static void pcsp_stop_playing(struct snd_pcsp *chip) | |||
178 | return; | 178 | return; |
179 | 179 | ||
180 | atomic_set(&chip->timer_active, 0); | 180 | atomic_set(&chip->timer_active, 0); |
181 | spin_lock(&i8253_lock); | 181 | raw_spin_lock(&i8253_lock); |
182 | /* restore the timer */ | 182 | /* restore the timer */ |
183 | outb_p(0xb6, 0x43); /* binary, mode 3, LSB/MSB, ch 2 */ | 183 | outb_p(0xb6, 0x43); /* binary, mode 3, LSB/MSB, ch 2 */ |
184 | outb(chip->val61 & 0xFC, 0x61); | 184 | outb(chip->val61 & 0xFC, 0x61); |
185 | spin_unlock(&i8253_lock); | 185 | raw_spin_unlock(&i8253_lock); |
186 | } | 186 | } |
187 | 187 | ||
188 | /* | 188 | /* |