aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/ad1848.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/oss/ad1848.c')
-rw-r--r--sound/oss/ad1848.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 4d2a6ae978f7..8a197fd3c57e 100644
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -458,7 +458,7 @@ static int ad1848_set_recmask(ad1848_info * devc, int mask)
458 return mask; 458 return mask;
459} 459}
460 460
461static void change_bits(ad1848_info * devc, unsigned char *regval, 461static void oss_change_bits(ad1848_info *devc, unsigned char *regval,
462 unsigned char *muteval, int dev, int chn, int newval) 462 unsigned char *muteval, int dev, int chn, int newval)
463{ 463{
464 unsigned char mask; 464 unsigned char mask;
@@ -516,10 +516,10 @@ static void ad1848_mixer_set_channel(ad1848_info *devc, int dev, int value, int
516 516
517 if (muteregoffs != regoffs) { 517 if (muteregoffs != regoffs) {
518 muteval = ad_read(devc, muteregoffs); 518 muteval = ad_read(devc, muteregoffs);
519 change_bits(devc, &val, &muteval, dev, channel, value); 519 oss_change_bits(devc, &val, &muteval, dev, channel, value);
520 } 520 }
521 else 521 else
522 change_bits(devc, &val, &val, dev, channel, value); 522 oss_change_bits(devc, &val, &val, dev, channel, value);
523 523
524 spin_lock_irqsave(&devc->lock,flags); 524 spin_lock_irqsave(&devc->lock,flags);
525 ad_write(devc, regoffs, val); 525 ad_write(devc, regoffs, val);