Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[sfrench/cifs-2.6.git] / net / dccp / probe.c

diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index a1362dc8abb0778716c296f767c8d4714225bc32..bace1d8cbcfdad1cae8135ba1946ef2b548b6e61 100644 (file)
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -161,7 +161,8 @@ static __init int dccpprobe_init(void)
        if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops))
                goto err0;
 
-       ret = register_jprobe(&dccp_send_probe);
+       ret = try_then_request_module((register_jprobe(&dccp_send_probe) == 0),
+                                       "dccp");
        if (ret)
                goto err1;