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

Commit eafda892 authored by Christian Lütke-Stetzkamp's avatar Christian Lütke-Stetzkamp Committed by Greg Kroah-Hartman
Browse files

staging: mt7621-mmc: Do not BUG() if mrq set in msdc_ops_request 



Currently the code BUG()'s, if host->mrq is set at the beginning of
msdc_ops_request. This shoould normally not happen, but it is not that
critical, because the critical sections are protected by a spin lock
and in the worst case, some commands to the card are lost, so it is
sufficient to just WARN_ON().

Signed-off-by: default avatarChristian Lütke-Stetzkamp <christian@lkamp.de>
Reviewed-by: default avatarNeilBrown <neil@brown.name>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec7375d1

drivers/staging/mt7621-mmc/sd.c

+1 −4
Original line number Diff line number Diff line
@@ -1716,10 +1716,7 @@ static void msdc_ops_request(struct mmc_host *mmc, struct mmc_request *mrq) 
	u32 ticks = 0, opcode = 0, sizes = 0, bRx = 0;

#endif /* end of --- */



	if (host->mrq) {

		ERR_MSG("XXX host->mrq<0x%.8x>", (int)host->mrq);

		BUG();

	}

	WARN_ON(host->mrq);



	if (!is_card_present(host) || host->power_mode == MMC_POWER_OFF) {

		ERR_MSG("cmd<%d> card<%d> power<%d>", mrq->cmd->opcode, is_card_present(host), host->power_mode);