diff options
| author | Julia Lawall <Julia.Lawall@lip6.fr> | 2013-01-21 03:02:48 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-28 12:17:24 -0700 |
| commit | aa94bf27d464126a42212d486211946f93d21b00 (patch) | |
| tree | 992d76b414af110bf8a3e50a9cdc446ec13683c8 /drivers/net | |
| parent | 95c4d95b1db2bfa42759ecb2000395a68a150bb0 (diff) | |
| download | linux-stable-aa94bf27d464126a42212d486211946f93d21b00.tar.gz linux-stable-aa94bf27d464126a42212d486211946f93d21b00.tar.bz2 linux-stable-aa94bf27d464126a42212d486211946f93d21b00.zip | |
drivers/net/ethernet/sfc/ptp.c: adjust duplicate test
[ Upstream commit 56567c6f8751c633581ca7c8e1cf08eed503f5ea ]
Delete successive tests to the same location. rc was previously tested and
not subsequently updated. efx_phc_adjtime can return an error code, so the
call is updated so that is tested instead.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@s exists@
local idexpression y;
expression x,e;
@@
*if ( \(x == NULL\|IS_ERR(x)\|y != 0\) )
{ ... when forall
return ...; }
... when != \(y = e\|y += e\|y -= e\|y |= e\|y &= e\|y++\|y--\|&y\)
when != \(XT_GETPAGE(...,y)\|WMI_CMD_BUF(...)\)
*if ( \(x == NULL\|IS_ERR(x)\|y != 0\) )
{ ... when forall
return ...; }
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/sfc/ptp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c index 0767043f44a4..3f93624fc273 100644 --- a/drivers/net/ethernet/sfc/ptp.c +++ b/drivers/net/ethernet/sfc/ptp.c @@ -1439,7 +1439,7 @@ static int efx_phc_settime(struct ptp_clock_info *ptp, delta = timespec_sub(*e_ts, time_now); - efx_phc_adjtime(ptp, timespec_to_ns(&delta)); + rc = efx_phc_adjtime(ptp, timespec_to_ns(&delta)); if (rc != 0) return rc; |