summaryrefslogtreecommitdiff
path: root/drivers/mmc/core/sdio.c
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2007-07-30 15:15:30 +0200
committerPierre Ossman <drzeus@drzeus.cx>2007-09-23 20:44:22 +0200
commit1a632f8cdc33e7f8edca352164f0c96a75d08f08 (patch)
tree6cc3174285ee11df586ae89cf0040ba2429a83f0 /drivers/mmc/core/sdio.c
parentb1538bcf75e2e11459947ec4d4329ed04fbe2b2c (diff)
sdio: split up common and function CIS parsing
Add a more clean separation between global, common CIS information and the function specific one as we need the common information in places where no specific function is specified. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/core/sdio.c')
-rw-r--r--drivers/mmc/core/sdio.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index c5baf76146b2..1fb36a340468 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -66,7 +66,7 @@ static int sdio_init_func(struct mmc_card *card, unsigned int fn)
if (ret)
goto fail;
- ret = sdio_read_cis(func);
+ ret = sdio_read_func_cis(func);
if (ret)
goto fail;
@@ -287,6 +287,13 @@ int mmc_attach_sdio(struct mmc_host *host, u32 ocr)
goto remove;
/*
+ * Read the common CIS tuples.
+ */
+ err = sdio_read_common_cis(card);
+ if (err)
+ goto remove;
+
+ /*
* Initialize (but don't add) all present functions.
*/
for (i = 0;i < funcs;i++) {