Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f677863 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v4.3-rc5' of git://git.linaro.org/people/ulf.hansson/mmc 

Pull MMC bugfix from Ulf Hansson:
 "Here's yet another MMC fix intended for v4.3 rc7.  I don't expect to
  send any further pull requests for 4.3 rc[n].

  MMC core:
   - Don't re-tune in the reset sequence to allow re-init of the card"

* tag 'mmc-v4.3-rc5' of git://git.linaro.org/people/ulf.hansson/mmc:
  mmc: core: Fix init_card in 52Mhz
parents be0e1987 08b137d9

drivers/mmc/card/mmc_test.c

+3 −6
Original line number Diff line number Diff line
@@ -2263,15 +2263,12 @@ static int mmc_test_profile_sglen_r_nonblock_perf(struct mmc_test_card *test) 
/*

 * eMMC hardware reset.

 */

static int mmc_test_hw_reset(struct mmc_test_card *test)

static int mmc_test_reset(struct mmc_test_card *test)

{

	struct mmc_card *card = test->card;

	struct mmc_host *host = card->host;

	int err;



	if (!mmc_card_mmc(card) || !mmc_can_reset(card))

		return RESULT_UNSUP_CARD;



	err = mmc_hw_reset(host);

	if (!err)

		return RESULT_OK;
@@ -2605,8 +2602,8 @@ static const struct mmc_test_case mmc_test_cases[] = { 
	},



	{

		.name = "eMMC hardware reset",

		.run = mmc_test_hw_reset,

		.name = "Reset test",

		.run = mmc_test_reset,

	},

};

drivers/mmc/core/mmc.c

+0 −7
Original line number Diff line number Diff line
@@ -1924,7 +1924,6 @@ EXPORT_SYMBOL(mmc_can_reset); 
static int mmc_reset(struct mmc_host *host)

{

	struct mmc_card *card = host->card;

	u32 status;



	if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset)

		return -EOPNOTSUPP;
@@ -1937,12 +1936,6 @@ static int mmc_reset(struct mmc_host *host) 


	host->ops->hw_reset(host);



	/* If the reset has happened, then a status command will fail */

	if (!mmc_send_status(card, &status)) {

		mmc_host_clk_release(host);

		return -ENOSYS;

	}



	/* Set initial state and call mmc_set_ios */

	mmc_set_initial_state(host);

	mmc_host_clk_release(host);