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

Commit 5a8a3fef authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Clear pointers when a request finishes 



Several pointers are used to identify when interrupts are expected. Namely,
host->cmd, host->data_cmd and host->data. Ensure those are cleared when
a request finishes. That tidies the case when a request is errored out
before normal processing has completed, ensuring any interrupts that occur
subsequently are not acted upon.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent ed1563de

drivers/mmc/host/sdhci.c

+9 −3
Original line number Diff line number Diff line
@@ -935,6 +935,15 @@ static bool sdhci_needs_reset(struct sdhci_host *host, struct mmc_request *mrq) 


static void sdhci_finish_mrq(struct sdhci_host *host, struct mmc_request *mrq)

{

	if (host->cmd && host->cmd->mrq == mrq)

		host->cmd = NULL;



	if (host->data_cmd && host->data_cmd->mrq == mrq)

		host->data_cmd = NULL;



	if (host->data && host->data->mrq == mrq)

		host->data = NULL;



	if (sdhci_needs_reset(host, mrq))

		host->pending_reset = true;
@@ -2240,9 +2249,6 @@ static void sdhci_tasklet_finish(unsigned long param) 
	}



	host->mrq = NULL;

	host->cmd = NULL;

	host->data = NULL;

	host->data_cmd = NULL;



	sdhci_led_deactivate(host);