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

Commit 43dea098 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Move host->data warning 



In order to support commands during data transfer, it will be possible
that host->data is not NULL when preparing a new request. Move a warning
that assumes otherwise.

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

drivers/mmc/host/sdhci.c

+2 −2
Original line number Diff line number Diff line
@@ -744,14 +744,14 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd) 
	u8 ctrl;

	struct mmc_data *data = cmd->data;



	WARN_ON(host->data);



	if (data || (cmd->flags & MMC_RSP_BUSY))

		sdhci_set_timeout(host, cmd);



	if (!data)

		return;



	WARN_ON(host->data);



	/* Sanity checks */

	BUG_ON(data->blksz * data->blocks > 524288);

	BUG_ON(data->blksz > host->mmc->max_blk_size);