aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/android
diff options
context:
space:
mode:
authorXu YiPing <xuyiping@hisilicon.com>2017-09-05 10:25:38 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-09-18 16:06:00 +0200
commit52b81611f209da5f49019260522633e994e241b5 (patch)
tree6e184c6958790f5949792b082488b6cfd567b754 /drivers/android
parentandroid: binder: fix type mismatch warning (diff)
downloadlinux-dev-52b81611f209da5f49019260522633e994e241b5.tar.xz
linux-dev-52b81611f209da5f49019260522633e994e241b5.zip
binder: fix an ret value override
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 Fixes: 372e3147df70 ("binder: refactor binder ref inc/dec for thread safety") Signed-off-by: Xu YiPing <xuyiping@hislicon.com> Signed-off-by: Todd Kjos <tkjos@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/android')
-rw-r--r--drivers/android/binder.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c
index 72af95c9ea22..b257bb0e2cfe 100644
--- a/drivers/android/binder.c
+++ b/drivers/android/binder.c
@@ -2326,7 +2326,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);