Commit 2c50b0ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 97eb2d98 92771cdd

drivers/mmc/host/dw_mmc-starfive.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int dw_mci_starfive_execute_tuning(struct dw_mci_slot *slot, 
	struct dw_mci *host = slot->host;

	struct starfive_priv *priv = host->priv;

	int rise_point = -1, fall_point = -1;

	int err, prev_err;

	int err, prev_err = 0;

	int i;

	bool found = 0;

	u32 regval;

drivers/mmc/host/sdhci_am654.c

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ static void sdhci_am654_write_b(struct sdhci_host *host, u8 val, int reg) 
					MAX_POWER_ON_TIMEOUT, false, host, val,

					reg);

		if (ret)

			dev_warn(mmc_dev(host->mmc), "Power on failed\n");

			dev_info(mmc_dev(host->mmc), "Power on failed\n");

	}

}