From: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Date: Tue, 2 Feb 2010 20:16:56 +0000 (+0000)
Subject: dccp: fix auto-loading of dccp(_probe)
X-Git-Tag: v2.6.33-rc8~34^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1386be55e32a3c5d8ef4a2b243c530a7b664c02c;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed