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

Conflicts:
	drivers/net/can/usb/ems_usb.c

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