summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGary King <gking@nvidia.com>2009-12-07 18:39:21 -0800
committerGary King <gking@nvidia.com>2010-05-21 19:34:58 -0700
commitc7edc161906cbdf0598dcf7f3cc7845c9328baaa (patch)
tree5b3e176070afb59f59b64521ec7ad14788c538a3 /drivers
parent303b737304f4d57cfc9f7f9f25ac6f78a23863bf (diff)
mmc: add detection for MMC 4.4 boot sectors
properly unpacks the boot sector extension in MMC 4.4 CID responses
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/core/mmc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 2ad71ba187df..c190477ca0bc 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -86,7 +86,8 @@ static int mmc_decode_cid(struct mmc_card *card)
case 3: /* MMC v3.1 - v3.3 */
case 4: /* MMC v4 */
card->cid.manfid = UNSTUFF_BITS(resp, 120, 8);
- card->cid.oemid = UNSTUFF_BITS(resp, 104, 16);
+ card->cid.cbx = UNSTUFF_BITS(resp, 112, 2);
+ card->cid.oemid = UNSTUFF_BITS(resp, 104, 8);
card->cid.prod_name[0] = UNSTUFF_BITS(resp, 96, 8);
card->cid.prod_name[1] = UNSTUFF_BITS(resp, 88, 8);
card->cid.prod_name[2] = UNSTUFF_BITS(resp, 80, 8);