From 0f8bfcc5415ebe7f407f49ac2ae6392ded2795ff Mon Sep 17 00:00:00 2001
From: Sasha Levin <sasha.levin@oracle.com>
Date: Thu, 20 Dec 2012 14:11:30 -0500
Subject: [PATCH] --- yaml --- r: 349941 b: refs/heads/master c:
 c91368c4889a0ee5dd06552adbb50ae54f5096fd h: refs/heads/master i:   349939:
 53a55985b67a773891c74eb2fdfc4648fc17a7ea v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/events/uprobes.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1de6a402f7be..79b1f8c41ccd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50ca19aed8ad2e264ef6bce6d6d5cb7f8bfae8c9
+refs/heads/master: c91368c4889a0ee5dd06552adbb50ae54f5096fd
diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c
index dea7acfbb071..30ea9a4f4ab4 100644
--- a/trunk/kernel/events/uprobes.c
+++ b/trunk/kernel/events/uprobes.c
@@ -901,8 +901,7 @@ void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consume
 	}
 
 	mutex_unlock(uprobes_hash(inode));
-	if (uprobe)
-		put_uprobe(uprobe);
+	put_uprobe(uprobe);
 }
 
 static struct rb_node *