diff options
| author | David S. Miller | 2009-11-08 23:00:54 -0800 |
|---|---|---|
| committer | David S. Miller | 2009-11-08 23:00:54 -0800 |
| commit | d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4 (patch) | |
| tree | daab7cc0db83226672f76d2fc9277e4355f89e6b /drivers/net/qlge | |
| parent | 9e0d57fd6dad37d72a3ca6db00ca8c76f2215454 (diff) | |
| parent | 2606289779cb297320a185db5997729d29b6700b (diff) | |
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')
| -rw-r--r-- | drivers/net/qlge/qlge_main.c | 2 | ||||
| -rw-r--r-- | drivers/net/qlge/qlge_mpi.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 0de596ad8a7e..bd8e164b121c 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c @@ -4145,6 +4145,8 @@ static int __devinit ql_init_device(struct pci_dev *pdev, goto err_out; } + /* Set PCIe reset type for EEH to fundamental. */ + pdev->needs_freset = 1; pci_save_state(pdev); qdev->reg_base = ioremap_nocache(pci_resource_start(pdev, 1), 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 |