diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-23 10:39:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-23 10:39:21 -0800 |
| commit | b9c2b05022152ccec9a0c5987739a3e891e7d621 (patch) | |
| tree | 690daac625b42cc9ce95b3f806726b130f793503 /drivers/staging | |
| parent | 7834904362c914f813c4d4c4045bd563144c4394 (diff) | |
| parent | e194fd8a5d8e0a7eeed239a8534460724b62fe2d (diff) | |
Merge tag 'staging-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree fix from Greg KH:
"Here is a single android driver fix for 3.14-rc4 that fixes a reported
problem in the binder driver"
* tag 'staging-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: binder: Fix death notifications
Diffstat (limited to 'drivers/staging')
| -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); |