diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /drivers/net/sfc/mcdi.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
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 5e118f0d2479..d98479030ef2 100644 --- a/drivers/net/sfc/mcdi.c +++ b/drivers/net/sfc/mcdi.c | |||
| @@ -453,7 +453,7 @@ static void efx_mcdi_ev_death(struct efx_nic *efx, int rc) | |||
| 453 | * | 453 | * |
| 454 | * There's a race here with efx_mcdi_rpc(), because we might receive | 454 | * There's a race here with efx_mcdi_rpc(), because we might receive |
| 455 | * a REBOOT event *before* the request has been copied out. In polled | 455 | * a REBOOT event *before* the request has been copied out. In polled |
| 456 | * mode (during startup) this is irrelevent, because efx_mcdi_complete() | 456 | * mode (during startup) this is irrelevant, because efx_mcdi_complete() |
| 457 | * is ignored. In event mode, this condition is just an edge-case of | 457 | * is ignored. In event mode, this condition is just an edge-case of |
| 458 | * receiving a REBOOT event after posting the MCDI request. Did the mc | 458 | * receiving a REBOOT event after posting the MCDI request. Did the mc |
| 459 | * reboot before or after the copyout? The best we can do always is | 459 | * reboot before or after the copyout? The best we can do always is |