Merge 3.5-rc7 into char-misc-next.

[firefly-linux-kernel-4.4.55.git] / drivers / mmc / host / omap.c

diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 6b07730598dab6f817a42ba8e3c5a46391f1b3be..3e8dcf8d2e051efea306e933fa701d7f92d53333 100644 (file)
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -1485,6 +1485,7 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev)
        }
 
        host->nr_slots = pdata->nr_slots;
+       host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
 
        host->mmc_omap_wq = alloc_workqueue("mmc_omap", 0, 0);
        if (!host->mmc_omap_wq)
@@ -1500,8 +1501,6 @@ static int __devinit mmc_omap_probe(struct platform_device *pdev)
                }
        }
 
-       host->reg_shift = (cpu_is_omap7xx() ? 1 : 2);
-
        return 0;
 
 err_destroy_wq: