wireless/orinoco_plx: replace
Subsystems (2)
PATCH 1/1 wireless/orinoco_plx: replace
I would appreciate any comments from the janitors list.
Applys-to: 2.6.7
Description: Use msleep() instead of schedule_timeout() to guarantee the task delays for the desired time.
Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/net/wireless/airport.c +5 -10
@@ -91,8 +91,7 @@ airport_resume(struct macio_dev *mdev)printk (KERN_DEBUG "%s: Airport waking up\n" , dev->name);pmac_call_feature (PMAC_FTR_AIRPORT_ENABLE ,macio_get_of_node (mdev),0 ,1 ); -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (HZ /5 ); +msleep (200 );enable_irq (dev->irq);
@@ -144,8 +143,7 @@ airport_detach(struct macio_dev *mdev)macio_release_resource (mdev,0 );pmac_call_feature (PMAC_FTR_AIRPORT_ENABLE ,macio_get_of_node (mdev),0 ,0 ); -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (HZ ); +msleep (1000 );macio_set_drvdata (mdev,NULL );free_netdev (dev);
@@ -171,11 +169,9 @@ static int airport_hard_reset(struct oridisable_irq (dev->irq);pmac_call_feature (PMAC_FTR_AIRPORT_ENABLE ,macio_get_of_node (card->mdev),0 ,0 ); -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (HZ ); +msleep (1000 );pmac_call_feature (PMAC_FTR_AIRPORT_ENABLE ,macio_get_of_node (card->mdev),0 ,1 ); -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (HZ ); +msleep (1000 );enable_irq (dev->irq);schedule_timeout (HZ );
@@ -237,8 +233,7 @@ airport_attach(struct macio_dev *mdev, c/* Power up card */ pmac_call_feature (PMAC_FTR_AIRPORT_ENABLE ,macio_get_of_node (mdev),0 ,1 ); -set_current_state (TASK_UNINTERRUPTIBLE ); -schedule_timeout (HZ ); +msleep (1000 );/* Reset it before we get the interrupt */ hermes_init (hw);
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors
PATCH 1/1 wireless/orinoco_tmd: replace
I would appreciate any comments from the janitors list.
Applys-to: 2.6.7
Description: Use msleep() instead of schedule_timeout() to guarantee the task delays for the desired time.
Signed-off-by Nishanth Aravamudan <[email protected]>
drivers/net/wireless/orinoco_tmd.c +1 -2
@@ -222,8 +222,7 @@ static int __init orinoco_tmd_init(void) extern void __exit orinoco_tmd_exit(void) {pci_unregister_driver (&orinoco_tmd_driver); - current->state =TASK_UNINTERRUPTIBLE ; -schedule_timeout (HZ ); +msleep (1000 ); }module_init (orinoco_tmd_init);
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors