aboutsummaryrefslogtreecommitdiffstats
path: root/sound/oss/sb_mixer.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/oss/sb_mixer.c')
-rw-r--r--sound/oss/sb_mixer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/oss/sb_mixer.c b/sound/oss/sb_mixer.c
index 2039d31b7e22..f8f3b7a66b73 100644
--- a/sound/oss/sb_mixer.c
+++ b/sound/oss/sb_mixer.c
@@ -232,7 +232,7 @@ static int detect_mixer(sb_devc * devc)
232 return 1; 232 return 1;
233} 233}
234 234
235static void change_bits(sb_devc * devc, unsigned char *regval, int dev, int chn, int newval) 235static void oss_change_bits(sb_devc *devc, unsigned char *regval, int dev, int chn, int newval)
236{ 236{
237 unsigned char mask; 237 unsigned char mask;
238 int shift; 238 int shift;
@@ -284,7 +284,7 @@ int sb_common_mixer_set(sb_devc * devc, int dev, int left, int right)
284 return -EINVAL; 284 return -EINVAL;
285 285
286 val = sb_getmixer(devc, regoffs); 286 val = sb_getmixer(devc, regoffs);
287 change_bits(devc, &val, dev, LEFT_CHN, left); 287 oss_change_bits(devc, &val, dev, LEFT_CHN, left);
288 288
289 if ((*devc->iomap)[dev][RIGHT_CHN].regno != regoffs) /* 289 if ((*devc->iomap)[dev][RIGHT_CHN].regno != regoffs) /*
290 * Change register 290 * Change register
@@ -304,7 +304,7 @@ int sb_common_mixer_set(sb_devc * devc, int dev, int left, int right)
304 * Read the new one 304 * Read the new one
305 */ 305 */
306 } 306 }
307 change_bits(devc, &val, dev, RIGHT_CHN, right); 307 oss_change_bits(devc, &val, dev, RIGHT_CHN, right);
308 308
309 sb_setmixer(devc, regoffs, val); 309 sb_setmixer(devc, regoffs, val);
310 310