lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] bcm43xx: re-add bcm43xx_rng_init() call

Browse Source 
Calls to bcm43xx_rng_init() and bcm43xx_rng_exit() got
lost due to merge trouble. Re-add them.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Michael Buesch
2006-08-16 00:29:07 +02:00
committed by John W. Linville
parent 9218e02bd4
commit 7a9b8cdacf
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/wireless/bcm43xx/bcm43xx_main.c
View File

@@ -3274,6 +3274,7 @@ static int bcm43xx_shutdown_all_wireless_cores(struct bcm43xx_private *bcm)
/* This is the opposite of bcm43xx_init_board() */ /* This is the opposite of bcm43xx_init_board() */
static void bcm43xx_free_board(struct bcm43xx_private *bcm) static void bcm43xx_free_board(struct bcm43xx_private *bcm)
{ {
bcm43xx_rng_exit(bcm);
bcm43xx_sysfs_unregister(bcm); bcm43xx_sysfs_unregister(bcm);
bcm43xx_periodic_tasks_delete(bcm); bcm43xx_periodic_tasks_delete(bcm);
@@ -3541,6 +3542,9 @@ static int bcm43xx_init_board(struct bcm43xx_private *bcm)
err = bcm43xx_sysfs_register(bcm); err = bcm43xx_sysfs_register(bcm);
if (err) if (err)
goto err_wlshutdown; goto err_wlshutdown;
err = bcm43xx_rng_init(bcm);
if (err)
goto err_sysfs_unreg;
/*FIXME: This should be handled by softmac instead. */ /*FIXME: This should be handled by softmac instead. */
schedule_work(&bcm->softmac->associnfo.work); schedule_work(&bcm->softmac->associnfo.work);
@@ -3550,6 +3554,8 @@ out:
return err; return err;
err_sysfs_unreg:
bcm43xx_sysfs_unregister(bcm);
err_wlshutdown: err_wlshutdown:
bcm43xx_shutdown_all_wireless_cores(bcm); bcm43xx_shutdown_all_wireless_cores(bcm);
err_crystal_off: err_crystal_off: