Skip to content

Commit 2c50b0c

Browse files
committed
Merge tag 'mmc-v6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC host fixes from Ulf Hansson: - dw_mmc-starfive: Fix initialization of the prev_err variable - sdhci_am654: Lower power-on failed message severity * tag 'mmc-v6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: mmc: dw_mmc-starfive: Fix initialization of prev_err mmc: sdhci_am654: lower power-on failed message severity
2 parents 97eb2d9 + 92771cd commit 2c50b0c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/mmc/host/dw_mmc-starfive.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static int dw_mci_starfive_execute_tuning(struct dw_mci_slot *slot,
5151
struct dw_mci *host = slot->host;
5252
struct starfive_priv *priv = host->priv;
5353
int rise_point = -1, fall_point = -1;
54-
int err, prev_err;
54+
int err, prev_err = 0;
5555
int i;
5656
bool found = 0;
5757
u32 regval;

drivers/mmc/host/sdhci_am654.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ static void sdhci_am654_write_b(struct sdhci_host *host, u8 val, int reg)
369369
MAX_POWER_ON_TIMEOUT, false, host, val,
370370
reg);
371371
if (ret)
372-
dev_warn(mmc_dev(host->mmc), "Power on failed\n");
372+
dev_info(mmc_dev(host->mmc), "Power on failed\n");
373373
}
374374
}
375375

0 commit comments

Comments
 (0)