diff --git a/[refs] b/[refs] index e0d099a73088..fe588eea7e35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 062caf43d803771b660defe6b147711d8b730364 +refs/heads/master: b8e7cdb391c50cfc243a387b6690f5a251537e50 diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c index 1af330d496fc..acf567c2e220 100644 --- a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c +++ b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c @@ -2328,7 +2328,7 @@ void bcm43xx_mac_suspend(struct bcm43xx_private *bcm) tmp = bcm43xx_read32(bcm, BCM43xx_MMIO_GEN_IRQ_REASON); if (tmp & BCM43xx_IRQ_READY) goto out; - udelay(10); + udelay(1); } printkl(KERN_ERR PFX "MAC suspend failed\n"); }