Messages in this thread Patch in this message |  | | From | Keith Owens <> | Subject | 2.1.16, patch for compilation error in aci.c | Date | Sun, 22 Dec 1996 16:57:29 +1100 |
| |
Trying to compile a kernel with every legal option turned on. Compilation errors in aci.c, it is still using the old get_user form. Patch follows, compiles OK but not tested.
diff -ur linux-2.1.16.orig/drivers/sound/lowlevel/aci.c linux/drivers/sound/lowlevel/aci.c --- linux-2.1.16.orig/drivers/sound/lowlevel/aci.c Fri Oct 25 20:06:35 1996 +++ linux/drivers/sound/lowlevel/aci.c Sun Dec 22 16:41:38 1996 @@ -292,7 +292,7 @@ int vol, ret; unsigned param; - param = get_user((int *) arg); + get_user(param, (int *) arg); /* left channel */ vol = param & 0xff; if (vol > 100) vol = 100; @@ -313,13 +313,13 @@ static int aci_mixer_ioctl (int dev, unsigned int cmd, caddr_t arg) { - int status, vol; + int status, vol, i; unsigned char buf; /* handle solo mode control */ if (cmd == SOUND_MIXER_PRIVATE1) { - if (get_user((int *) arg) >= 0) { - aci_solo = !!get_user((int *) arg); + if (get_user(i, (int *) arg) >= 0) { + aci_solo = !!i; if (write_cmd(0xd2, aci_solo)) return -EIO; } else if (aci_version >= 0xb0) { if ((status = read_general_status()) < 0) return -EIO; @@ -349,7 +349,8 @@ case SOUND_MIXER_LINE2: /* AUX2 */ return setvolume(arg, 0x3e, 0x36); case SOUND_MIXER_IGAIN: /* MIC pre-amp */ - vol = get_user((int *) arg) & 0xff; + get_user(vol, (int *) arg); + vol &= 0xff; if (vol > 100) vol = 100; vol = SCALE(100, 3, vol); if (write_cmd(0x03, vol)) return -EIO;
|  |