lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source
This commit is contained in:
David S. Miller
2010-02-25 23:22:42 -08:00
parent 54831a83bf c4d49794ff
commit 0448873480
15 changed files with 106 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/sfc/mcdi.c
View File

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