diff --git a/[refs] b/[refs] index 0edb5cdfc443..be9315b2f711 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 46cbc1d3981ee753518fbf9198a14f71a9f6841e +refs/heads/master: 3c24783bb2deafaa106b7e69a97540071afc590c diff --git a/trunk/ipc/sem.c b/trunk/ipc/sem.c index c8e00f8b4be1..fb13be17945b 100644 --- a/trunk/ipc/sem.c +++ b/trunk/ipc/sem.c @@ -1460,7 +1460,6 @@ SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops, * Array removed? If yes, leave without sem_unlock(). */ if (IS_ERR(sma)) { - error = -EIDRM; goto out_free; }