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

Commit d2997040 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v4.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc 

Pull MMC fixes from Ulf Hansson:
 "MMC host:

   - sdhci-msm: Fix error path in probe
   - dw_mmc-pltfm: Avoid NULL pointer dereference"

* tag 'mmc-v4.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
  mmc: sdhci-msm: Fix error return code in sdhci_msm_probe()
  mmc: dw_mmc-pltfm: fix the potential NULL pointer dereference
parents 594aef64 d1f63f0c

drivers/mmc/host/dw_mmc-pltfm.c

+3 −2
Original line number Diff line number Diff line
@@ -46,12 +46,13 @@ int dw_mci_pltfm_register(struct platform_device *pdev, 
	host->pdata = pdev->dev.platform_data;



	regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	/* Get registers' physical base address */

	host->phy_regs = regs->start;

	host->regs = devm_ioremap_resource(&pdev->dev, regs);

	if (IS_ERR(host->regs))

		return PTR_ERR(host->regs);



	/* Get registers' physical base address */

	host->phy_regs = regs->start;



	platform_set_drvdata(pdev, host);

	return dw_mci_probe(host);

}

drivers/mmc/host/sdhci-msm.c

+1 −0
Original line number Diff line number Diff line
@@ -647,6 +647,7 @@ static int sdhci_msm_probe(struct platform_device *pdev) 
	if (msm_host->pwr_irq < 0) {

		dev_err(&pdev->dev, "Get pwr_irq failed (%d)\n",

			msm_host->pwr_irq);

		ret = msm_host->pwr_irq;

		goto clk_disable;

	}