diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-04 04:16:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-05-04 04:16:59 -0700 |
| commit | dae1a193e4543ebbaceaa2eab56bf3d025097a8d (patch) | |
| tree | 3b54d1130f74b8bf3b4005ee81da4e5cfdc36c53 /ipc | |
| parent | ae959b6d2a403207a7e4bfb7368ad6121162bd47 (diff) | |
| parent | e19e23033576506fea82f72e39c7cdd2b477df76 (diff) | |
Merge bk://kernel.bkbits.net/davem/sparc-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/mqueue.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 8c54e3e81d22..d13a9f37e145 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c @@ -811,9 +811,9 @@ asmlinkage long sys_mq_timedsend(mqd_t mqdes, const char __user *u_msg_ptr, wait.msg = (void *) msg_ptr; wait.state = STATE_NONE; ret = wq_sleep(info, SEND, timeout, &wait); - if (ret < 0) - free_msg(msg_ptr); } + if (ret < 0) + free_msg(msg_ptr); } else { receiver = wq_get_first_waiter(info, RECV); if (receiver) { |