Commit ae6a2c44 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.4-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.5.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 16f2e6c0 3c40eb81

drivers/mmc/host/meson-gx-mmc.c

+2 −8
Original line number Diff line number Diff line
@@ -991,11 +991,8 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) 


		if (data && !cmd->error)

			data->bytes_xfered = data->blksz * data->blocks;

		if (meson_mmc_bounce_buf_read(data) ||

		    meson_mmc_get_next_command(cmd))

			ret = IRQ_WAKE_THREAD;

		else

			ret = IRQ_HANDLED;



		return IRQ_WAKE_THREAD;

	}



out:
@@ -1007,9 +1004,6 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) 
		writel(start, host->regs + SD_EMMC_START);

	}



	if (ret == IRQ_HANDLED)

		meson_mmc_request_done(host->mmc, cmd->mrq);



	return ret;

}

drivers/mmc/host/mmci.c

+2 −1
Original line number Diff line number Diff line
@@ -1735,7 +1735,8 @@ static void mmci_set_max_busy_timeout(struct mmc_host *mmc) 
		return;



	if (host->variant->busy_timeout && mmc->actual_clock)

		max_busy_timeout = ~0UL / (mmc->actual_clock / MSEC_PER_SEC);

		max_busy_timeout = U32_MAX / DIV_ROUND_UP(mmc->actual_clock,

							  MSEC_PER_SEC);



	mmc->max_busy_timeout = max_busy_timeout;

}