diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-09 08:00:54 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-09 08:00:54 +0100 |
| commit | d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4 (patch) | |
| tree | daab7cc0db83226672f76d2fc9277e4355f89e6b /drivers/net/qlge/qlge_mpi.c | |
| parent | xfrm: SAD entries do not expire correctly after suspend-resume (diff) | |
| parent | net/fsl_pq_mdio: add module license GPL (diff) | |
| download | linux-d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4.tar.xz linux-d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/can/usb/ems_usb.c
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 f5619fe87bb2..e2b2286102d4 100644 --- a/drivers/net/qlge/qlge_mpi.c +++ b/drivers/net/qlge/qlge_mpi.c @@ -483,7 +483,7 @@ static int ql_mailbox_command(struct ql_adapter *qdev, struct mbox_params *mbcp) /* Wait for the interrupt to come in. */ status = ql_wait_mbx_cmd_cmplt(qdev); if (status) - goto end; + continue; /* Process the event. If it's an AEN, it * will be handled in-line or a worker |