summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Nelson <eric.nelson@boundarydevices.com>2013-12-13 09:58:08 -0700
committerEric Nelson <eric.nelson@boundarydevices.com>2013-12-13 09:58:08 -0700
commit5e13eda4f773fecd4d52a8ff35d430d643540833 (patch)
tree6d702edb260223c83fbe36ff52619d0fa2e30c4d
parentad826f23fcb58a30a8fd3588e1e88d84a282ef6c (diff)
parent5ca12b7757162dd45da10ab45887dcc0df8df533 (diff)
Merge branch 'boundary-imx_3.0.35_4.1.0' of github.com:boundarydevices/linux-imx6 into boundary-imx_3.0.35_4.1.0
-rw-r--r--drivers/mmc/core/mmc.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 2bd67d527157..cd4b93ffd566 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -439,6 +439,8 @@ static int mmc_compare_ext_csds(struct mmc_card *card, unsigned bus_width)
err = mmc_get_ext_csd(card, &bw_ext_csd);
if (err || bw_ext_csd == NULL) {
+ pr_err("%s: %p err=%d could not get csd when bus_width=%d\n",
+ __func__, bw_ext_csd, err, bus_width);
if (bus_width != MMC_BUS_WIDTH_1)
err = -EINVAL;
goto out;
@@ -461,7 +463,7 @@ static int mmc_compare_ext_csds(struct mmc_card *card, unsigned bus_width)
(card->ext_csd.raw_s_a_timeout ==
bw_ext_csd[EXT_CSD_S_A_TIMEOUT]) &&
(card->ext_csd.raw_hc_erase_gap_size ==
- bw_ext_csd[EXT_CSD_HC_WP_GRP_SIZE]) &&
+ bw_ext_csd[EXT_CSD_PARTITION_ATTRIBUTE]) &&
(card->ext_csd.raw_erase_timeout_mult ==
bw_ext_csd[EXT_CSD_ERASE_TIMEOUT_MULT]) &&
(card->ext_csd.raw_hc_erase_grp_size ==
@@ -1173,6 +1175,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
if (!err)
break;
}
+ pr_err("%s: err=%d bus_width=%d\n", __func__, err, bus_width);
}
if (!err && ddr) {