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

Commit 4861187d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: core: Fix NULL pointer dereference issue with mmc_blk_reset()"

parents 7c2e6b28 f3c8290e

drivers/mmc/card/block.c

+7 −1
Original line number Diff line number Diff line
@@ -1306,8 +1306,14 @@ static int mmc_blk_reset(struct mmc_blk_data *md, struct mmc_host *host, 


	md->reset_done |= type;

	err = mmc_hw_reset(host);

	if (err && err != -EOPNOTSUPP) {

		/* We failed to reset so we need to abort the request */

		pr_err("%s: %s: failed to reset %d\n", mmc_hostname(host),

				__func__, err);

		return -ENODEV;

	}

	/* Ensure we switch back to the correct partition */

	if (err != -EOPNOTSUPP) {

	if (host->card) {

		struct mmc_blk_data *main_md = mmc_get_drvdata(host->card);

		int part_err;