[PATCH 2/2] staging: binder: Code simplification

[Mathieu Maret]

Remove duplicate code

Signed-off-by: Mathieu Maret <mathieu.maret@xxxxxxxxx>
---
 drivers/staging/android/binder.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 6d8ee37..67aaa38 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -2685,11 +2685,9 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
 		break;
 	case BINDER_VERSION: {
 		struct binder_version __user *ver = ubuf;
-		if (size != sizeof(struct binder_version)) {
-			ret = -EINVAL;
-			goto err;
-		}
-		if (put_user(BINDER_CURRENT_PROTOCOL_VERSION,
+
+		if (size != sizeof(struct binder_version) ||
+			put_user(BINDER_CURRENT_PROTOCOL_VERSION,
 			&ver->protocol_version)) {
 			ret = -EINVAL;
 			goto err;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/