Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-2
+3
-2
drivers/mmc/host/dw_mmc-pltfm.c
+3
-2
drivers/mmc/host/dw_mmc-pltfm.c
···
46
46
host->pdata = pdev->dev.platform_data;
47
47
48
48
regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
49
-
/* Get registers' physical base address */
50
-
host->phy_regs = regs->start;
51
49
host->regs = devm_ioremap_resource(&pdev->dev, regs);
52
50
if (IS_ERR(host->regs))
53
51
return PTR_ERR(host->regs);
52
+
53
+
/* Get registers' physical base address */
54
+
host->phy_regs = regs->start;
54
55
55
56
platform_set_drvdata(pdev, host);
56
57
return dw_mci_probe(host);