1 files changed, 9 insertions, 17 deletions

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index e4d1dcfe8299..5cb2199435d2 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -1565,6 +1565,9 @@ static void rtl_pci_stop(struct ieee80211_hw *hw)
 
         rtlpci->driver_is_goingto_unload = true;
         rtlpriv->cfg->ops->hw_disable(hw);
+        /* some things are not needed if firmware not available */
+        if (!rtlpriv->max_fw_size)
+                return;
         rtlpriv->cfg->ops->led_control(hw, LED_CTL_POWER_OFF);
 
         spin_lock_irqsave(&rtlpriv->locks.rf_ps_lock, flags);
@@ -1779,6 +1782,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         rtlpriv = hw->priv;
         pcipriv = (void *)rtlpriv->priv;
         pcipriv->dev.pdev = pdev;
+        init_completion(&rtlpriv->firmware_loading_complete);
 
         /* init cfg & intf_ops */
         rtlpriv->rtlhal.interface = INTF_PCI;
@@ -1799,7 +1803,7 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
         err = pci_request_regions(pdev, KBUILD_MODNAME);
         if (err) {
                 RT_ASSERT(false, "Can't obtain PCI resources\n");
-                return err;
+                goto fail2;
         }
 
         pmem_start = pci_resource_start(pdev, rtlpriv->cfg->bar_id);
@@ -1862,15 +1866,6 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
                 goto fail3;
         }
 
-        err = ieee80211_register_hw(hw);
-        if (err) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "Can't register mac80211 hw\n");
-                goto fail3;
-        } else {
-                rtlpriv->mac80211.mac80211_registered = 1;
-        }
-
         err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
@@ -1878,9 +1873,6 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
                 goto fail3;
         }
 
-        /*init rfkill */
-        rtl_init_rfkill(hw);
-
         rtlpci = rtl_pcidev(pcipriv);
         err = request_irq(rtlpci->pdev->irq, &_rtl_pci_interrupt,
                           IRQF_SHARED, KBUILD_MODNAME, hw);
@@ -1889,24 +1881,22 @@ int __devinit rtl_pci_probe(struct pci_dev *pdev,
                          "%s: failed to register IRQ handler\n",
                          wiphy_name(hw->wiphy));
                 goto fail3;
-        } else {
-                rtlpci->irq_alloc = 1;
         }
+        rtlpci->irq_alloc = 1;
 
-        set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
         return 0;
 
 fail3:
         pci_set_drvdata(pdev, NULL);
         rtl_deinit_core(hw);
         _rtl_pci_io_handler_release(hw);
-        ieee80211_free_hw(hw);
 
         if (rtlpriv->io.pci_mem_start != 0)
                 pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start);
 
 fail2:
         pci_release_regions(pdev);
+        complete(&rtlpriv->firmware_loading_complete);
 
 fail1:
 
@@ -1925,6 +1915,8 @@ void rtl_pci_disconnect(struct pci_dev *pdev)
         struct rtl_pci *rtlpci = rtl_pcidev(pcipriv);
         struct rtl_mac *rtlmac = rtl_mac(rtlpriv);
 
+        /* just in case driver is removed before firmware callback */
+        wait_for_completion(&rtlpriv->firmware_loading_complete);
         clear_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
 
         sysfs_remove_group(&pdev->dev.kobj, &rtl_attribute_group);