summaryrefslogtreecommitdiffstats
path: root/drivers/bcma/core.c
diff options
context:
space:
mode:
authorRafał Miłecki2012-09-25 10:17:22 +0200
committerJohn W. Linville2012-09-28 19:54:02 +0200
commit1fd41a65f19bdabb31549af00ce23d4c5c14781a (patch)
tree7fcb424f7ca6c58aa886062ba4ea3a81f6efde54 /drivers/bcma/core.c
parentMerge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff)
downloadkernel-qcow2-linux-1fd41a65f19bdabb31549af00ce23d4c5c14781a.tar.gz
kernel-qcow2-linux-1fd41a65f19bdabb31549af00ce23d4c5c14781a.tar.xz
kernel-qcow2-linux-1fd41a65f19bdabb31549af00ce23d4c5c14781a.zip
bcma: change delays to follow timers-howto guide
Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Cc: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/bcma/core.c')
-rw-r--r--drivers/bcma/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bcma/core.c b/drivers/bcma/core.c
index 63c8b470536f..03bbe104338f 100644
--- a/drivers/bcma/core.c
+++ b/drivers/bcma/core.c
@@ -65,7 +65,7 @@ void bcma_core_set_clockmode(struct bcma_device *core,
switch (clkmode) {
case BCMA_CLKMODE_FAST:
bcma_set32(core, BCMA_CLKCTLST, BCMA_CLKCTLST_FORCEHT);
- udelay(64);
+ usleep_range(64, 300);
for (i = 0; i < 1500; i++) {
if (bcma_read32(core, BCMA_CLKCTLST) &
BCMA_CLKCTLST_HAVEHT) {