bcm43xx: re-add bcm43xx_rng_init() call
Subsystems (3)
PATCH 1/1 bcm43xx: re-add bcm43xx_rng_init() call
Hi John,
Please apply this to wireless-2.6.
Please also drop Adrian's patch (If you queued it somewhere):
[RFC: -mm patch] bcm43xx_main.c: remove 3 functions
--
Calls to bcm43xx_rng_init() and bcm43xx_rng_exit() got lost due to merge trouble. Re-add them.
Signed-off-by Michael Buesch <[email protected]>
drivers/net/wireless/bcm43xx/bcm43xx_main.c +6 -0
@@ -3274,6 +3274,7 @@/* This is the opposite of bcm43xx_init_board() */ static void bcm43xx_free_board (struct bcm43xx_private *bcm) { +bcm43xx_rng_exit (bcm);bcm43xx_sysfs_unregister (bcm);bcm43xx_periodic_tasks_delete (bcm);
@@ -3541,6 +3542,9 @@ err =bcm43xx_sysfs_register (bcm);if (err) goto err_wlshutdown; + err =bcm43xx_rng_init (bcm); +if (err) + goto err_sysfs_unreg;/*FIXME: This should be handled by softmac instead. */ schedule_work (&bcm->softmac->associnfo.work);
@@ -3550,6 +3554,8 @@return err; +err_sysfs_unreg: +bcm43xx_sysfs_unregister (bcm); err_wlshutdown:bcm43xx_shutdown_all_wireless_cores (bcm); err_crystal_off:
Signature · 1 line
Greetings Michael.