From 76a2a4e9e2cd756a7a2d0ff00ea2f7df0acee4d8 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 1 Dec 2011 14:45:49 -0500
Subject: [PATCH] --- yaml --- r: 278322 b: refs/heads/master c:
 d984e6197ecd2babc1537f42dc1e676133005cda h: refs/heads/master v: v3

---
 [refs]                 |  2 +-
 trunk/net/dccp/probe.c | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f5015a0a1f83..3ead151a9ecf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65698610f58153eb7621be3fb4f57ca318b19c60
+refs/heads/master: d984e6197ecd2babc1537f42dc1e676133005cda
diff --git a/trunk/net/dccp/probe.c b/trunk/net/dccp/probe.c
index 33d0e6297c21..0a8d6ebd9b45 100644
--- a/trunk/net/dccp/probe.c
+++ b/trunk/net/dccp/probe.c
@@ -152,6 +152,17 @@ static const struct file_operations dccpprobe_fops = {
 	.llseek  = noop_llseek,
 };
 
+static __init int setup_jprobe(void)
+{
+	int ret = register_jprobe(&dccp_send_probe);
+
+	if (ret) {
+		request_module("dccp");
+		ret = register_jprobe(&dccp_send_probe);
+	}
+	return ret;
+}
+
 static __init int dccpprobe_init(void)
 {
 	int ret = -ENOMEM;
@@ -163,8 +174,7 @@ static __init int dccpprobe_init(void)
 	if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops))
 		goto err0;
 
-	try_then_request_module((ret = register_jprobe(&dccp_send_probe)) == 0,
-				"dccp");
+	ret = setup_jprobe();
 	if (ret)
 		goto err1;