diff options
| author | Eric Anholt <eric@anholt.net> | 2009-12-01 12:01:54 -0500 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-12-01 12:01:54 -0500 |
| commit | f40d6817a5c2bf84f5fe7b5d1a83f1e8f8669951 (patch) | |
| tree | 1c515a34a60f65cbfd3cf1a387427d0a9fdf878f /drivers/net/qlge/qlge_mpi.c | |
| parent | 103a196f4224dc6872081305cf7f82ebf67aa7bd (diff) | |
| parent | 46557bef3f3834ac33031c7be27d39d90d507442 (diff) | |
Merge remote branch 'airlied/drm-next' into drm-intel-next
Diffstat (limited to 'drivers/net/qlge/qlge_mpi.c')
| -rw-r--r-- | drivers/net/qlge/qlge_mpi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/qlge/qlge_mpi.c b/drivers/net/qlge/qlge_mpi.c index bcf13c96f73f..aec05f266107 100644 --- a/drivers/net/qlge/qlge_mpi.c +++ b/drivers/net/qlge/qlge_mpi.c | |||
| @@ -499,7 +499,7 @@ static int ql_mailbox_command(struct ql_adapter *qdev, struct mbox_params *mbcp) | |||
| 499 | /* Wait for the interrupt to come in. */ | 499 | /* Wait for the interrupt to come in. */ |
| 500 | status = ql_wait_mbx_cmd_cmplt(qdev); | 500 | status = ql_wait_mbx_cmd_cmplt(qdev); |
| 501 | if (status) | 501 | if (status) |
| 502 | goto end; | 502 | continue; |
| 503 | 503 | ||
| 504 | /* Process the event. If it's an AEN, it | 504 | /* Process the event. If it's an AEN, it |
| 505 | * will be handled in-line or a worker | 505 | * will be handled in-line or a worker |