From d664a5d386c29f0b2f05bc67220eb3d81f4b6e68 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 29 Jul 2008 00:53:20 +0200 Subject: [PATCH] --- yaml --- r: 107251 b: refs/heads/master c: 980167b7fb20fb181766218b4771fc7420a7bbb4 h: refs/heads/master i: 107249: 98e866faafc704646481ab8638af8759b93bac8c 107247: fd55904011629870045498c1a485a041fac76826 v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 615492d48fcf..76c4a10e3691 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebd6d357848edb8709dd9bed4b93834d1b4d7044 +refs/heads/master: 980167b7fb20fb181766218b4771fc7420a7bbb4 diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c index 9191aaf2e52c..e3a8133560a2 100644 --- a/trunk/drivers/mmc/host/sdhci.c +++ b/trunk/drivers/mmc/host/sdhci.c @@ -448,7 +448,7 @@ static int sdhci_adma_table_pre(struct sdhci_host *host, host->adma_addr = dma_map_single(mmc_dev(host->mmc), host->adma_desc, (128 * 2 + 1) * 4, DMA_TO_DEVICE); - if (dma_mapping_error(mmc_dev(host->mmc), host->align_addr)) + if (dma_mapping_error(mmc_dev(host->mmc), host->adma_addr)) goto unmap_entries; BUG_ON(host->adma_addr & 0x3);