diff options
Diffstat (limited to 'net/dccp/probe.c')
| -rw-r--r-- | net/dccp/probe.c | 19 | 
1 files changed, 7 insertions, 12 deletions
diff --git a/net/dccp/probe.c b/net/dccp/probe.c index 4c6bdf97a65..595ddf0459d 100644 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c @@ -152,17 +152,6 @@ 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; @@ -174,7 +163,13 @@ static __init int dccpprobe_init(void)  	if (!proc_create(procname, S_IRUSR, init_net.proc_net, &dccpprobe_fops))  		goto err0; -	ret = setup_jprobe(); +	ret = register_jprobe(&dccp_send_probe); +	if (ret) { +		ret = request_module("dccp"); +		if (!ret) +			ret = register_jprobe(&dccp_send_probe); +	} +  	if (ret)  		goto err1;  | 
