Merge tag 'mmc-updates-for-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-drm-fsl-dcu.git] / drivers / mmc / host / dw_mmc.c

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index beafb4ce37aa7edfeccec7073d6660a82eb13dec..018f365e5ae46c71a6e8a0f2327e9fb8775c900d 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2230,7 +2230,7 @@ int dw_mci_probe(struct dw_mci *host)
                }
        }
 
-       host->vmmc = devm_regulator_get(host->dev, "vmmc");
+       host->vmmc = devm_regulator_get_optional(host->dev, "vmmc");
        if (IS_ERR(host->vmmc)) {
                ret = PTR_ERR(host->vmmc);
                if (ret == -EPROBE_DEFER)