diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2023-09-27 12:39:29 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2023-09-27 12:39:29 +0200 |
| commit | 09b59829715bc3c929bb300e2bd5d01e37faa3d3 (patch) | |
| tree | 8ad962c1d585dbf43c234257fd86a7e82401d657 /drivers/mmc | |
| parent | 4b9b94766534ea23bffc8606b73fb18501b49a67 (diff) | |
| parent | 84ee19bffc9306128cd0f1c650e89767079efeff (diff) | |
| download | linux-09b59829715bc3c929bb300e2bd5d01e37faa3d3.tar.gz | |
mmc: Merge branch fixes into next
Merge the mmc fixes for v6.6-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.7.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/core/mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 89cd48fcec79f2..4a4bab9aa7263e 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -104,7 +104,7 @@ 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.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); |