Commit 1386be55 authored Feb 02, 2010 by Gerrit Renker Committed by David S. Miller Feb 03, 2010

dccp: fix auto-loading of dccp(_probe)



This fixes commit (38ff3e6b) ("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>

parent 8ed030dd

net/dccp/probe.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -161,7 +161,7 @@ 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),
		try_then_request_module((ret = register_jprobe(&dccp_send_probe)) == 0,
		"dccp");
		if (ret)
		goto err1;

Admin message