diff options
author | Rabin Vincent <rabin@rab.in> | 2009-04-17 05:14:19 +0200 |
---|---|---|
committer | Pierre Ossman <pierre@ossman.eu> | 2009-05-03 22:12:27 +0200 |
commit | 4ea580f1db62c5419e6690878fd61a740f3aae8e (patch) | |
tree | c1eac49aef0f4a4f097f6bd21790694a6443951a /drivers | |
parent | sdhci: catch ADMA errors (diff) | |
download | linux-4ea580f1db62c5419e6690878fd61a740f3aae8e.tar.xz linux-4ea580f1db62c5419e6690878fd61a740f3aae8e.zip |
mmci: fix crash with debug enabled
If MMC debugging is enabled, the mmci driver oopses because the DBG
macro uses host->mmc before it is set. Set it earlier.
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Pierre Ossman <pierre@ossman.eu>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mmc/host/mmci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index a663429b3d55..36875dcfa492 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -514,6 +514,7 @@ static int __devinit mmci_probe(struct amba_device *dev, void *id) } host = mmc_priv(mmc); + host->mmc = mmc; /* Bits 12 thru 19 is the designer */ host->hw_designer = (dev->periphid >> 12) & 0xff; /* Bits 20 thru 23 is the revison */ @@ -545,7 +546,6 @@ static int __devinit mmci_probe(struct amba_device *dev, void *id) host->mclk = clk_get_rate(host->clk); DBG(host, "eventual mclk rate: %u Hz\n", host->mclk); } - host->mmc = mmc; host->base = ioremap(dev->res.start, SZ_4K); if (!host->base) { ret = -ENOMEM; |