diff --git a/[refs] b/[refs] index b159d7be6f05..8640bd3ffd8a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d987f8b213f2cdcc52b2ca9ee67161516e4d256a +refs/heads/master: e5cc9c7b1a3e7ae4d700d9fce168fb597bcfe9b6 diff --git a/trunk/ipc/sem.c b/trunk/ipc/sem.c index 82518d6a96a3..dbef95b15941 100644 --- a/trunk/ipc/sem.c +++ b/trunk/ipc/sem.c @@ -624,7 +624,7 @@ static unsigned long copy_semid_to_user(void __user *buf, struct semid64_ds *in, static int semctl_nolock(struct ipc_namespace *ns, int semid, int cmd, int version, union semun arg) { - int err = -EINVAL; + int err; struct sem_array *sma; switch(cmd) { @@ -701,7 +701,6 @@ static int semctl_nolock(struct ipc_namespace *ns, int semid, default: return -EINVAL; } - return err; out_unlock: sem_unlock(sma); return err;