Merge "mmc: core: Reset on error during deferred resume"

	if (host->bus_ops && !host->bus_dead && host->card) {

		mmc_power_up(host, host->card->ocr);

		BUG_ON(!host->bus_ops->resume);

		host->bus_ops->resume(host);

		err = host->bus_ops->resume(host);

		if (err) {

			pr_err("%s: bus resume: failed: %d\n",

			       mmc_hostname(host), err);

			err = mmc_hw_reset(host);

			if (err) {

				pr_err("%s: reset: failed: %d\n",

				       mmc_hostname(host), err);

				goto err_reset;

			} else {

				mmc_card_clr_suspended(host->card);

			}

		}

		if (mmc_card_cmdq(host->card)) {

			err = mmc_cmdq_halt(host, false);

			if (err)

				pr_err("%s: %s: unhalt failed: %d\n",

				       mmc_hostname(host), __func__, err);

			else

				mmc_card_clr_suspended(host->card);

		}

	}

err_reset:

	mmc_bus_put(host);

	pr_debug("%s: Deferred resume completed\n", mmc_hostname(host));

	return 0;

	return err;

}

EXPORT_SYMBOL(mmc_resume_bus);