git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ALSA: usb-audio: add support for Akai MPD16
[safe/jmp/linux-2.6]
/
ipc
/
sem.c
diff --git
a/ipc/sem.c
b/ipc/sem.c
index
82518d6
..
dbef95b
100644
(file)
--- 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)
{
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) {
struct sem_array *sma;
switch(cmd) {
@@
-701,7
+701,6
@@
static int semctl_nolock(struct ipc_namespace *ns, int semid,
default:
return -EINVAL;
}
default:
return -EINVAL;
}
- return err;
out_unlock:
sem_unlock(sma);
return err;
out_unlock:
sem_unlock(sma);
return err;