2 files changed, 6 insertions, 4 deletions

diff --git a/drivers/mmc/host/sdhci-pltfm.c b/drivers/mmc/host/sdhci-pltfm.c
index 685202be277..00e8a8ab638 100644
--- a/drivers/mmc/host/sdhci-pltfm.c
+++ b/drivers/mmc/host/sdhci-pltfm.c
@@ -52,15 +52,17 @@ static struct sdhci_ops sdhci_pltfm_ops = {
 
 static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
 {
-        struct sdhci_pltfm_data *pdata = pdev->dev.platform_data;
         const struct platform_device_id *platid = platform_get_device_id(pdev);
+        struct sdhci_pltfm_data *pdata;
         struct sdhci_host *host;
         struct sdhci_pltfm_host *pltfm_host;
         struct resource *iomem;
         int ret;
 
-        if (!pdata && platid && platid->driver_data)
+        if (platid && platid->driver_data)
                 pdata = (void *)platid->driver_data;
+        else
+                pdata = pdev->dev.platform_data;
 
         iomem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!iomem) {
@@ -109,7 +111,7 @@ static int __devinit sdhci_pltfm_probe(struct platform_device *pdev)
         }
 
         if (pdata && pdata->init) {
-                ret = pdata->init(host);
+                ret = pdata->init(host, pdata);
                 if (ret)
                         goto err_plat_init;
         }
diff --git a/include/linux/mmc/sdhci-pltfm.h b/include/linux/mmc/sdhci-pltfm.h
index 0239bd70241..548d59d404c 100644
--- a/include/linux/mmc/sdhci-pltfm.h
+++ b/include/linux/mmc/sdhci-pltfm.h
@@ -28,7 +28,7 @@ struct sdhci_host;
 struct sdhci_pltfm_data {
         struct sdhci_ops *ops;
         unsigned int quirks;
-        int (*init)(struct sdhci_host *host);
+        int (*init)(struct sdhci_host *host, struct sdhci_pltfm_data *pdata);
         void (*exit)(struct sdhci_host *host);
 };