X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=blobdiff_plain;f=ipc%2Fsem.c;h=dbef95b1594122c2a6276d504d206805d39879f7;hp=82518d6a96a34583ae76f6ec85795f32aa70cb2e;hb=4434ade8c9334a3ab975d8993de456f06841899e;hpb=d987f8b213f2cdcc52b2ca9ee67161516e4d256a

diff --git a/ipc/sem.c b/ipc/sem.c
index 82518d6..dbef95b 100644
--- a/ipc/sem.c
+++ b/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;