3 files changed, 9 insertions, 5 deletions

diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c
index d5e51b1c7b3f..956bd7677502 100644
--- a/drivers/mmc/core/sdio_cis.c
+++ b/drivers/mmc/core/sdio_cis.c
@@ -129,6 +129,12 @@ static int cistpl_funce_func(struct sdio_func *func,
         /* TPLFE_MAX_BLK_SIZE */
         func->max_blksize = buf[12] | (buf[13] << 8);
 
+        /* TPLFE_ENABLE_TIMEOUT_VAL, present in ver 1.1 and above */
+        if (vsn > SDIO_SDIO_REV_1_00)
+                func->enable_timeout = (buf[28] | (buf[29] << 8)) * 10;
+        else
+                func->enable_timeout = jiffies_to_msecs(HZ);
+
         return 0;
 }
 
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, &reg);
diff --git a/include/linux/mmc/sdio_func.h b/include/linux/mmc/sdio_func.h
index 28fb0a33acf8..07bee4a0d457 100755
--- a/include/linux/mmc/sdio_func.h
+++ b/include/linux/mmc/sdio_func.h
@@ -46,6 +46,8 @@ struct sdio_func {
         unsigned                max_blksize;    /* maximum block size */
         unsigned                cur_blksize;    /* current block size */
 
+        unsigned                enable_timeout; /* max enable timeout in msec */
+
         unsigned int            state;          /* function state */
 #define SDIO_STATE_PRESENT      (1<<0)          /* present in sysfs */