Merge branch 'for-next' of git://git.o-hand.com/linux-mfd

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

diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index 95430b81ec11f9d000079a73bfa9cd13cb9b4ba1..63fbd5b7d312b503e285a68a1895af709c134027 100644 (file)
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -224,7 +224,7 @@ static inline void tmio_mmc_data_irq(struct tmio_mmc_host *host)
 {
        void __iomem *ctl = host->ctl;
        struct mmc_data *data = host->data;
-       struct mmc_command *stop = data->stop;
+       struct mmc_command *stop;
 
        host->data = NULL;
 
@@ -232,6 +232,7 @@ static inline void tmio_mmc_data_irq(struct tmio_mmc_host *host)
                pr_debug("Spurious data end IRQ\n");
                return;
        }
+       stop = data->stop;
 
        /* FIXME - return correct transfer count on errors */
        if (!data->error)
@@ -567,11 +568,11 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
        host->mmc = mmc;
        platform_set_drvdata(dev, mmc);
 
-       host->ctl = ioremap(res_ctl->start, res_ctl->end - res_ctl->start);
+       host->ctl = ioremap(res_ctl->start, resource_size(res_ctl));
        if (!host->ctl)
                goto host_free;
 
-       host->cnf = ioremap(res_cnf->start, res_cnf->end - res_cnf->start);
+       host->cnf = ioremap(res_cnf->start, resource_size(res_cnf));
        if (!host->cnf)
                goto unmap_ctl;
 
@@ -649,10 +650,10 @@ static int __devexit tmio_mmc_remove(struct platform_device *dev)
        if (mmc) {
                struct tmio_mmc_host *host = mmc_priv(mmc);
                mmc_remove_host(mmc);
-               mmc_free_host(mmc);
                free_irq(host->irq, host);
                iounmap(host->ctl);
                iounmap(host->cnf);
+               mmc_free_host(mmc);
        }
 
        return 0;