diff options
author | Benzi Zbit <benzi.zbit@intel.com> | 2008-07-10 03:41:43 +0400 |
---|---|---|
committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-07-15 17:47:03 +0400 |
commit | 62a7573ee9f31d4fdb330b3e68ebf6efaba1d57c (patch) | |
tree | 33a3823791937d3e9d26eb08c4e15c39d377c21f /drivers/mmc/core/sdio_io.c | |
parent | c71f65129a1fb67bc6b9b8d03b493675b5c9302b (diff) | |
download | linux-62a7573ee9f31d4fdb330b3e68ebf6efaba1d57c.tar.xz |
sdio: fix the use of hard coded timeout value.
This adds reading and using of enable_timeout from the CIS
Signed-off-by: Benzi Zbit <benzi.zbit@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/core/sdio_io.c')
-rwxr-xr-x | drivers/mmc/core/sdio_io.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/mmc/core/sdio_io.c b/drivers/mmc/core/sdio_io.c index 3ccf6919877c..0888df64581f 100755 --- a/drivers/mmc/core/sdio_io.c +++ b/drivers/mmc/core/sdio_io.c @@ -76,11 +76,7 @@ int sdio_enable_func(struct sdio_func *func) if (ret) goto err; - /* - * FIXME: This should timeout based on information in the CIS, - * but we don't have card to parse that yet. - */ - timeout = jiffies + HZ; + timeout = jiffies + msecs_to_jiffies(func->enable_timeout); while (1) { ret = mmc_io_rw_direct(func->card, 0, 0, SDIO_CCCR_IORx, 0, ®); |