From: Xu YiPing <xuyiping@hisilicon.com>
Date: Tue, 5 Sep 2017 17:00:59 +0000 (-0700)
Subject: FROMLIST: binder: fix an ret value override
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5a7ddaf1c48b6df9b93908e68fb35cdd5a7672db;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

FROMLIST: binder: fix an ret value override

(from https://patchwork.kernel.org/patch/9939409/)

commit 372e3147df70 ("binder: guarantee txn complete / errors delivered
in-order") incorrectly defined a local ret value.  This ret value will
be invalid when out of the if block

Change-Id: If7bd963ac7e67d135aa949133263aac27bf15d1a
Signed-off-by: Xu YiPing <xuyiping@hislicon.com>
Signed-off-by: Todd Kjos <tkjos@google.com>
---

diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index a4a94831d55..93c97e1b5af 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -2488,7 +2488,6 @@ static int binder_translate_handle(struct flat_binder_object *fp,
 			     (u64)node->ptr);
 		binder_node_unlock(node);
 	} else {
-		int ret;
 		struct binder_ref_data dest_rdata;
 
 		binder_node_unlock(node);