git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dccp: Fix compile warning in probe code.
[pandora-kernel.git]
/
net
/
dccp
/
probe.c
diff --git
a/net/dccp/probe.c
b/net/dccp/probe.c
index
33d0e62
..
0a8d6eb
100644
(file)
--- a/
net/dccp/probe.c
+++ b/
net/dccp/probe.c
@@
-152,6
+152,17
@@
static const struct file_operations dccpprobe_fops = {
.llseek = noop_llseek,
};
.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;
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;
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;
if (ret)
goto err1;