diff options
author | Tony Lindgren <tony@atomide.com> | 2010-02-17 14:08:58 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-02-17 14:08:58 -0800 |
commit | 80c20d543d142ee54ec85259b77aaf0b83c32db5 (patch) | |
tree | 364017b2c001939bbb645dcc20d565c1f71b13a8 /net/dccp/probe.c | |
parent | d6a2d9b800276140abf352908abbd0c240890692 (diff) | |
parent | b72c7d543589736d43da531566490dd31572f5ca (diff) | |
download | linux-80c20d543d142ee54ec85259b77aaf0b83c32db5.tar.gz |
Merge branch 'omap-fixes-for-linus' into omap-for-linus
Diffstat (limited to 'net/dccp/probe.c')
-rw-r--r-- | net/dccp/probe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/probe.c b/net/dccp/probe.c index bace1d8cbcfd..f5b3464f1242 100644 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c @@ -161,8 +161,8 @@ static __init int dccpprobe_init(void) if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops)) goto err0; - ret = try_then_request_module((register_jprobe(&dccp_send_probe) == 0), - "dccp"); + try_then_request_module((ret = register_jprobe(&dccp_send_probe)) == 0, + "dccp"); if (ret) goto err1; |