|
|
@@ -2424,6 +2424,7 @@ error:
|
|
|
|
|
|
static int b43_one_core_attach(struct b43_bus_dev *dev, struct b43_wl *wl);
|
|
|
static void b43_one_core_detach(struct b43_bus_dev *dev);
|
|
|
+static int b43_rng_init(struct b43_wl *wl);
|
|
|
|
|
|
static void b43_request_firmware(struct work_struct *work)
|
|
|
{
|
|
|
@@ -2475,6 +2476,10 @@ start_ieee80211:
|
|
|
goto err_one_core_detach;
|
|
|
wl->hw_registred = true;
|
|
|
b43_leds_register(wl->current_dev);
|
|
|
+
|
|
|
+ /* Register HW RNG driver */
|
|
|
+ b43_rng_init(wl);
|
|
|
+
|
|
|
goto out;
|
|
|
|
|
|
err_one_core_detach:
|
|
|
@@ -4636,9 +4641,6 @@ static void b43_wireless_core_exit(struct b43_wldev *dev)
|
|
|
if (!dev || b43_status(dev) != B43_STAT_INITIALIZED)
|
|
|
return;
|
|
|
|
|
|
- /* Unregister HW RNG driver */
|
|
|
- b43_rng_exit(dev->wl);
|
|
|
-
|
|
|
b43_set_status(dev, B43_STAT_UNINIT);
|
|
|
|
|
|
/* Stop the microcode PSM. */
|
|
|
@@ -4795,9 +4797,6 @@ static int b43_wireless_core_init(struct b43_wldev *dev)
|
|
|
|
|
|
b43_set_status(dev, B43_STAT_INITIALIZED);
|
|
|
|
|
|
- /* Register HW RNG driver */
|
|
|
- b43_rng_init(dev->wl);
|
|
|
-
|
|
|
out:
|
|
|
return err;
|
|
|
|
|
|
@@ -5464,6 +5463,9 @@ static void b43_bcma_remove(struct bcma_device *core)
|
|
|
|
|
|
b43_one_core_detach(wldev->dev);
|
|
|
|
|
|
+ /* Unregister HW RNG driver */
|
|
|
+ b43_rng_exit(wl);
|
|
|
+
|
|
|
b43_leds_unregister(wl);
|
|
|
|
|
|
ieee80211_free_hw(wl->hw);
|
|
|
@@ -5541,6 +5543,9 @@ static void b43_ssb_remove(struct ssb_device *sdev)
|
|
|
|
|
|
b43_one_core_detach(dev);
|
|
|
|
|
|
+ /* Unregister HW RNG driver */
|
|
|
+ b43_rng_exit(wl);
|
|
|
+
|
|
|
if (list_empty(&wl->devlist)) {
|
|
|
b43_leds_unregister(wl);
|
|
|
/* Last core on the chip unregistered.
|