aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sh_mmcif.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 0189efcb9e12..ba76a532ae30 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1369,6 +1369,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
1369 ret = -ENOMEM; 1369 ret = -ENOMEM;
1370 goto ealloch; 1370 goto ealloch;
1371 } 1371 }
1372 mmc_of_parse(mmc);
1372 host = mmc_priv(mmc); 1373 host = mmc_priv(mmc);
1373 host->mmc = mmc; 1374 host->mmc = mmc;
1374 host->addr = reg; 1375 host->addr = reg;
@@ -1381,7 +1382,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
1381 mmc->ops = &sh_mmcif_ops; 1382 mmc->ops = &sh_mmcif_ops;
1382 sh_mmcif_init_ocr(host); 1383 sh_mmcif_init_ocr(host);
1383 1384
1384 mmc->caps = MMC_CAP_MMC_HIGHSPEED | MMC_CAP_WAIT_WHILE_BUSY; 1385 mmc->caps |= MMC_CAP_MMC_HIGHSPEED | MMC_CAP_WAIT_WHILE_BUSY;
1385 if (pd && pd->caps) 1386 if (pd && pd->caps)
1386 mmc->caps |= pd->caps; 1387 mmc->caps |= pd->caps;
1387 mmc->max_segs = 32; 1388 mmc->max_segs = 32;