From: maximilian attems Signed-off-by: Maximilian Attems Signed-off-by: Andrew Morton --- 25-akpm/drivers/char/rocket.c | 4 ---- 1 files changed, 4 deletions(-) diff -puN drivers/char/rocket.c~remove-last-suser-call-drivers-char-rocketc drivers/char/rocket.c --- 25/drivers/char/rocket.c~remove-last-suser-call-drivers-char-rocketc Tue Aug 17 14:44:54 2004 +++ 25-akpm/drivers/char/rocket.c Tue Aug 17 14:44:54 2004 @@ -1283,11 +1283,7 @@ static int set_config(struct r_port *inf if (copy_from_user(&new_serial, new_info, sizeof (new_serial))) return -EFAULT; -#ifdef CAP_SYS_ADMIN if (!capable(CAP_SYS_ADMIN)) -#else - if (!suser()) -#endif { if ((new_serial.flags & ~ROCKET_USR_MASK) != (info->flags & ~ROCKET_USR_MASK)) return -EPERM; _