summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2010-02-02 20:16:56 +0000
committerDavid S. Miller <davem@davemloft.net>2010-02-03 19:00:31 -0800
commit1386be55e32a3c5d8ef4a2b243c530a7b664c02c (patch)
treec63c4953a415bd3522c951f3b9a93ad3422412e4 /net
parent8ed030dd0aa400d18c63861c2c6deb7c38f4edde (diff)
downloadlinux-3.10-1386be55e32a3c5d8ef4a2b243c530a7b664c02c.tar.gz
linux-3.10-1386be55e32a3c5d8ef4a2b243c530a7b664c02c.tar.bz2
linux-3.10-1386be55e32a3c5d8ef4a2b243c530a7b664c02c.zip
dccp: fix auto-loading of dccp(_probe)
This fixes commit (38ff3e6bb987ec583268da8eb22628293095d43b) ("dccp_probe: Fix module load dependencies between dccp and dccp_probe", from 15 Jan). It fixes the construction of the first argument of try_then_request_module(), where only valid return codes from the first argument should be returned. What we do now is assign the result of register_jprobe() to ret, without the side effect of the comparison. Acked-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/dccp/probe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index bace1d8cbcf..f5b3464f124 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;