diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-26 08:22:42 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-26 08:22:42 +0100 |
commit | 04488734806948624dabc4514f96f14cd75b9a50 (patch) | |
tree | 74f3a3c10a7177a5f86398b83ad7bf0569fe8b89 /drivers/net/sfc/mcdi.c | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/... (diff) | |
parent | net: bug fix for vlan + gro issue (diff) | |
download | linux-04488734806948624dabc4514f96f14cd75b9a50.tar.xz linux-04488734806948624dabc4514f96f14cd75b9a50.zip |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/sfc/mcdi.c')
-rw-r--r-- | drivers/net/sfc/mcdi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/mcdi.c b/drivers/net/sfc/mcdi.c index 86610db2cff5..c48669c77414 100644 --- a/drivers/net/sfc/mcdi.c +++ b/drivers/net/sfc/mcdi.c @@ -127,7 +127,7 @@ static int efx_mcdi_poll(struct efx_nic *efx) efx_dword_t reg; /* Check for a reboot atomically with respect to efx_mcdi_copyout() */ - rc = efx_mcdi_poll_reboot(efx); + rc = -efx_mcdi_poll_reboot(efx); if (rc) goto out; |