diff --git a/[refs] b/[refs] index 5d707b0639f1..058e2f6e2362 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efde99cd281a3f0d3562bb2fa7e7ef60ad32fe8d +refs/heads/master: bf2023614201b36f929cce0d9fbb3cc856ea7c1a diff --git a/trunk/drivers/staging/android/binder.c b/trunk/drivers/staging/android/binder.c index 668bec7213d5..a807129c7b5a 100644 --- a/trunk/drivers/staging/android/binder.c +++ b/trunk/drivers/staging/android/binder.c @@ -415,13 +415,13 @@ static int task_get_unused_fd_flags(struct binder_proc *proc, int flags) else __clear_close_on_exec(fd, fdt); files->next_fd = fd + 1; -#if 1 + /* Sanity check */ if (fdt->fd[fd] != NULL) { pr_warn("get_unused_fd: slot %d not NULL!\n", fd); fdt->fd[fd] = NULL; } -#endif + error = fd; out: