From: Sachin Kamat Date: Fri, 17 Aug 2012 11:09:37 +0000 (+0530) Subject: Staging: android: binder: Remove an inconsequential conditional macro X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bf2023614201b36f929cce0d9fbb3cc856ea7c1a;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Staging: android: binder: Remove an inconsequential conditional macro Removes an inconsequential conditional macro. Cc: Arve Hjønnevåg Signed-off-by: Sachin Kamat Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c index 668bec7213d5..a807129c7b5a 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -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: