diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-10-01 15:39:36 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-10-01 15:39:36 +0400 |
| commit | e4d680c706284ca0413a84bd2a28fda76b360904 (patch) | |
| tree | 6613396dafb5c7d1f2d946ea8e7f4f57a482bad6 /drivers/bcma/core.c | |
| parent | a248afdc1b5916c2bfd007233112333d85aa28f6 (diff) | |
| parent | 5160b46f3e53c41c4c6b9e7cdbe0401d3afbfb63 (diff) | |
| download | linux-e4d680c706284ca0413a84bd2a28fda76b360904.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/bcma/core.c')
| -rw-r--r-- | drivers/bcma/core.c | 2 |
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) { |