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

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

Merge "mmc: sdhci-msm: return correct error code if emmc is not bootdevice"

parents 80093f30 2b96669a

drivers/mmc/host/sdhci-msm.c

+3 −1
Original line number Diff line number Diff line
@@ -3183,8 +3183,10 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
		}



		/* skip the probe if eMMC isn't a boot device */

		if ((ret == 1) && !sdhci_msm_is_bootdevice(&pdev->dev))

		if ((ret == 1) && !sdhci_msm_is_bootdevice(&pdev->dev)) {

			ret = -ENODEV;

			goto pltfm_free;

		}



		if (disable_slots & (1 << (ret - 1))) {

			dev_info(&pdev->dev, "%s: Slot %d disabled\n", __func__,