diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-24 12:33:52 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-24 12:33:52 -0800 |
| commit | b42060069faa0daf7915acec4f31e4a46bca3b32 (patch) | |
| tree | e403a7948aedea5897fd3118da0ff1c9926690a7 /drivers/staging/android | |
| parent | aa256f8d0dd9c2dff872849418d8e09e5d06718f (diff) | |
| parent | cfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff) | |
| download | blackbird-obmc-linux-b42060069faa0daf7915acec4f31e4a46bca3b32.tar.gz blackbird-obmc-linux-b42060069faa0daf7915acec4f31e4a46bca3b32.zip | |
Merge 3.14-rc4 into staging-next.
We want those fixes here as well.
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/binder.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c index eaec1dab7fe4..1432d956769c 100644 --- a/drivers/staging/android/binder.c +++ b/drivers/staging/android/binder.c @@ -2904,7 +2904,7 @@ static int binder_node_release(struct binder_node *node, int refs) refs++; if (!ref->death) - goto out; + continue; death++; @@ -2917,7 +2917,6 @@ static int binder_node_release(struct binder_node *node, int refs) BUG(); } -out: binder_debug(BINDER_DEBUG_DEAD_BINDER, "node %d now dead, refs %d, death %d\n", node->debug_id, refs, death); |
