aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2023-10-27 12:00:35 +0200
committerUlf Hansson <ulf.hansson@linaro.org>2023-10-27 12:00:35 +0200
commit5428a40a308f220dbbffda66cb01b212f88e9a06 (patch)
treecc4d941880fd7274f99a324988b539246929efde
parentdt-bindings: mmc: sdhci-msm: document the SM8650 SDHCI Controller (diff)
parentmmc: meson-gx: Remove setting of CMD_CFG_ERROR (diff)
downloadwireguard-linux-5428a40a308f220dbbffda66cb01b212f88e9a06.tar.xz
wireguard-linux-5428a40a308f220dbbffda66cb01b212f88e9a06.zip
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>
-rw-r--r--drivers/mmc/host/meson-gx-mmc.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c
index 9837dab096e6..c7c067b9415a 100644
--- a/drivers/mmc/host/meson-gx-mmc.c
+++ b/drivers/mmc/host/meson-gx-mmc.c
@@ -801,7 +801,6 @@ static void meson_mmc_start_cmd(struct mmc_host *mmc, struct mmc_command *cmd)
cmd_cfg |= FIELD_PREP(CMD_CFG_CMD_INDEX_MASK, cmd->opcode);
cmd_cfg |= CMD_CFG_OWNER; /* owned by CPU */
- cmd_cfg |= CMD_CFG_ERROR; /* stop in case of error */
meson_mmc_set_response_bits(cmd, &cmd_cfg);