dccp: fix auto-loading of dccp(_probe)

This fixes commit (38ff3e6) ("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 <[email protected]> Signed-off-by: Neil Horman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
PJensen · Feb 4, 2010 · 1386be5 · 1386be5
1 parent 8ed030d
commit 1386be5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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;