mmc_spi: Add support for OpenFirmware bindings

[linux-2.6-omap-h63xx.git] / drivers / mmc / host / mmc_spi.c

diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c
index ad00e163231750177f39e4c6949e1d4cda3b916b..87e211df68ac0dcdaf75c6aab9f4cce9ebad97ab 100644 (file)
--- a/drivers/mmc/host/mmc_spi.c
+++ b/drivers/mmc/host/mmc_spi.c
@@ -1285,7 +1285,7 @@ static int mmc_spi_probe(struct spi_device *spi)
        /* Platform data is used to hook up things like card sensing
         * and power switching gpios.
         */
-       host->pdata = spi->dev.platform_data;
+       host->pdata = mmc_spi_get_pdata(spi);
        if (host->pdata)
                mmc->ocr_avail = host->pdata->ocr_mask;
        if (!mmc->ocr_avail) {
@@ -1368,6 +1368,7 @@ fail_glue_init:
 
 fail_nobuf1:
        mmc_free_host(mmc);
+       mmc_spi_put_pdata(spi);
        dev_set_drvdata(&spi->dev, NULL);
 
 nomem:
@@ -1402,6 +1403,7 @@ static int __devexit mmc_spi_remove(struct spi_device *spi)
 
                spi->max_speed_hz = mmc->f_max;
                mmc_free_host(mmc);
+               mmc_spi_put_pdata(spi);
                dev_set_drvdata(&spi->dev, NULL);
        }
        return 0;