Merge branch 'next/drivers' into HEAD

[deliverable/linux.git] / drivers / staging / android / binder.c

diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 574e99210c36cd1485012aec3b010dae712f27bf..a807129c7b5a93979e8dc52de5d167d98a327940 100644 (file)
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -365,7 +365,7 @@ binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer);
 /*
  * copied from get_unused_fd_flags
  */
-int task_get_unused_fd_flags(struct binder_proc *proc, int flags)
+static int task_get_unused_fd_flags(struct binder_proc *proc, int flags)
 {
        struct files_struct *files = proc->files;
        int fd, error;
@@ -415,13 +415,13 @@ repeat:
        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: