summaryrefslogtreecommitdiffstats
path: root/drivers/mmc/core/sdio.c
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2007-06-16 02:04:16 -0400
committerPierre Ossman <drzeus@drzeus.cx>2007-09-23 20:26:42 +0200
commitb726126196d54cbbba0924191e5c4dd5ba747fa2 (patch)
tree75d0923f93947e083a7fc77dfa073817a30b1682 /drivers/mmc/core/sdio.c
parent0597007f1b22bbb5d4234ca09c045f9bb2711270 (diff)
downloadlinux-b726126196d54cbbba0924191e5c4dd5ba747fa2.tar.gz
linux-b726126196d54cbbba0924191e5c4dd5ba747fa2.tar.bz2
linux-b726126196d54cbbba0924191e5c4dd5ba747fa2.zip
sdio: initial CIS parsing code
Signed-off-by: Nicolas Pitre <npitre@mvista.com> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/mmc/core/sdio.c')
-rw-r--r--drivers/mmc/core/sdio.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index be623856f288..c5baf76146b2 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -22,6 +22,7 @@
#include "mmc_ops.h"
#include "sd_ops.h"
#include "sdio_ops.h"
+#include "sdio_cis.h"
static int sdio_read_fbr(struct sdio_func *func)
{
@@ -65,6 +66,10 @@ static int sdio_init_func(struct mmc_card *card, unsigned int fn)
if (ret)
goto fail;
+ ret = sdio_read_cis(func);
+ if (ret)
+ goto fail;
+
card->sdio_func[fn - 1] = func;
return 0;