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

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

Merge "drivers: mmc: fix issue raised by source code analyzer tool"

parents 811dd333 543bcd96

drivers/mmc/core/mmc.c

+1 −1
Original line number Diff line number Diff line
@@ -2303,7 +2303,7 @@ static int mmc_test_awake_ext_csd(struct mmc_host *host) 
	struct mmc_card *card = host->card;



	err = mmc_get_ext_csd(card, &ext_csd);

	if (err) {

	if (err || !ext_csd) {

		pr_err("%s: %s: mmc_get_ext_csd failed (%d)\n",

			mmc_hostname(host), __func__, err);

		return err;

drivers/mmc/host/sdhci-msm.c

+1 −1
Original line number Diff line number Diff line
@@ -3934,7 +3934,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	/* Extract platform data */

	if (pdev->dev.of_node) {

		ret = of_alias_get_id(pdev->dev.of_node, "sdhc");

		if (ret < 0) {

		if (ret <= 0) {

			dev_err(&pdev->dev, "Failed to get slot index %d\n",

				ret);

			goto pltfm_free;

drivers/mmc/host/sdhci.c

+3 −1
Original line number Diff line number Diff line
@@ -3123,8 +3123,10 @@ static irqreturn_t sdhci_irq(int irq, void *dev_id) 


	if (!host->clock && host->mmc->card &&

			mmc_card_sdio(host->mmc->card)) {

		if (!mmc_card_and_host_support_async_int(host->mmc))

		if (!mmc_card_and_host_support_async_int(host->mmc)) {

			spin_unlock(&host->lock);

			return IRQ_NONE;

		}

		/*

		 * async card interrupt is level sensitive and received

		 * when clocks are off.