1 files changed, 12 insertions, 14 deletions

diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index 7783c5db81dc..3d0efea32111 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -3142,14 +3142,14 @@ static int ql_route_initialize(struct ql_adapter *qdev)
 {
         int status = 0;
 
-        status = ql_sem_spinlock(qdev, SEM_RT_IDX_MASK);
+        /* Clear all the entries in the routing table. */
+        status = ql_clear_routing_entries(qdev);
         if (status)
                 return status;
 
-        /* Clear all the entries in the routing table. */
-        status = ql_clear_routing_entries(qdev);
+        status = ql_sem_spinlock(qdev, SEM_RT_IDX_MASK);
         if (status)
-                goto exit;
+                return status;
 
         status = ql_set_routing_reg(qdev, RT_IDX_ALL_ERR_SLOT, RT_IDX_ERR, 1);
         if (status) {
@@ -3380,12 +3380,10 @@ static int ql_adapter_down(struct ql_adapter *qdev)
 
         ql_free_rx_buffers(qdev);
 
-        spin_lock(&qdev->hw_lock);
         status = ql_adapter_reset(qdev);
         if (status)
                 QPRINTK(qdev, IFDOWN, ERR, "reset(func #%d) FAILED!\n",
                         qdev->func);
-        spin_unlock(&qdev->hw_lock);
         return status;
 }
 
@@ -3705,7 +3703,7 @@ static void ql_asic_reset_work(struct work_struct *work)
         struct ql_adapter *qdev =
             container_of(work, struct ql_adapter, asic_reset_work.work);
         int status;
-
+        rtnl_lock();
         status = ql_adapter_down(qdev);
         if (status)
                 goto error;
@@ -3713,12 +3711,12 @@ static void ql_asic_reset_work(struct work_struct *work)
         status = ql_adapter_up(qdev);
         if (status)
                 goto error;
-
+        rtnl_unlock();
         return;
 error:
         QPRINTK(qdev, IFUP, ALERT,
                 "Driver up/down cycle failed, closing device\n");
-        rtnl_lock();
+
         set_bit(QL_ADAPTER_UP, &qdev->flags);
         dev_close(qdev->ndev);
         rtnl_unlock();
@@ -3834,11 +3832,14 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
                 return err;
         }
 
+        qdev->ndev = ndev;
+        qdev->pdev = pdev;
+        pci_set_drvdata(pdev, ndev);
         pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);
         if (pos <= 0) {
                 dev_err(&pdev->dev, PFX "Cannot find PCI Express capability, "
                         "aborting.\n");
-                goto err_out;
+                return pos;
         } else {
                 pci_read_config_word(pdev, pos + PCI_EXP_DEVCTL, &val16);
                 val16 &= ~PCI_EXP_DEVCTL_NOSNOOP_EN;
@@ -3851,7 +3852,7 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
         err = pci_request_regions(pdev, DRV_NAME);
         if (err) {
                 dev_err(&pdev->dev, "PCI region request failed.\n");
-                goto err_out;
+                return err;
         }
 
         pci_set_master(pdev);
@@ -3869,7 +3870,6 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
                 goto err_out;
         }
 
-        pci_set_drvdata(pdev, ndev);
         qdev->reg_base =
             ioremap_nocache(pci_resource_start(pdev, 1),
                             pci_resource_len(pdev, 1));
@@ -3889,8 +3889,6 @@ static int __devinit ql_init_device(struct pci_dev *pdev,
                 goto err_out;
         }
 
-        qdev->ndev = ndev;
-        qdev->pdev = pdev;
         err = ql_get_board_info(qdev);
         if (err) {
                 dev_err(&pdev->dev, "Register access failed.\n");