diff options
| author | Adrian Hunter | 2016-06-29 15:24:26 +0200 |
|---|---|---|
| committer | Ulf Hansson | 2016-07-25 10:34:39 +0200 |
| commit | 43dea098bbab82ab15ac9f26aee34c8114b2e5a2 (patch) | |
| tree | 327192faf32eaac2162e312cdd0deddc429979f3 /drivers/mmc/host/sdhci.c | |
| parent | mmc: sdhci: Reduce the use of host->mrq (diff) | |
| download | kernel-qcow2-linux-43dea098bbab82ab15ac9f26aee34c8114b2e5a2.tar.gz kernel-qcow2-linux-43dea098bbab82ab15ac9f26aee34c8114b2e5a2.tar.xz kernel-qcow2-linux-43dea098bbab82ab15ac9f26aee34c8114b2e5a2.zip | |
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: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'drivers/mmc/host/sdhci.c')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 3835b20877a5..ee4363b82f8c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -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); |