From 4bd5a0fab7f1a591d56d26e4afe65fb6f025b8cc Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Mon, 21 Jul 2008 00:45:15 +0200 Subject: [PATCH] --- yaml --- r: 105085 b: refs/heads/master c: 6cefd05f35177ad5d22d44519c680cf43f2ac86d h: refs/heads/master i: 105083: 2c78b0dff8aa86e411bc313e126f00b2c5e9ad7a v: v3 --- [refs] | 2 +- trunk/drivers/mmc/host/sdhci.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d57917a55c33..7ccfe029b5b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 48b5352ea1891455eb8e824cf7d92f66931a090f +refs/heads/master: 6cefd05f35177ad5d22d44519c680cf43f2ac86d diff --git a/trunk/drivers/mmc/host/sdhci.c b/trunk/drivers/mmc/host/sdhci.c index 17701c3da733..b27c1a28a7ca 100644 --- a/trunk/drivers/mmc/host/sdhci.c +++ b/trunk/drivers/mmc/host/sdhci.c @@ -389,6 +389,7 @@ static int sdhci_adma_table_pre(struct sdhci_host *host, if (offset) { if (data->flags & MMC_DATA_WRITE) { buffer = sdhci_kmap_atomic(sg, &flags); + WARN_ON(((long)buffer & PAGE_MASK) > (PAGE_SIZE - 3)); memcpy(align, buffer, offset); sdhci_kunmap_atomic(buffer, &flags); } @@ -510,6 +511,7 @@ static void sdhci_adma_table_post(struct sdhci_host *host, size = 4 - (sg_dma_address(sg) & 0x3); buffer = sdhci_kmap_atomic(sg, &flags); + WARN_ON(((long)buffer & PAGE_MASK) > (PAGE_SIZE - 3)); memcpy(buffer, align, size); sdhci_kunmap_atomic(buffer, &flags);