From a96bf40e7aeb50acffcccad3ffd31909d46fc1ce Mon Sep 17 00:00:00 2001 From: Evgeniy Polyakov Date: Thu, 5 Jan 2006 10:31:23 +0000 Subject: [PATCH] --- yaml --- r: 16727 b: refs/heads/master c: f3e2628bed0d5a88ced8239b35f1534557f9631c h: refs/heads/master i: 16725: 7f847bbc6f7d508672818f77345d3134a6a9f3fa 16723: 906bf64de4d4a5fc32c7a46310f623896ef93dd1 16719: f505c461f9db53c8b52755124388e8e7855239fe v: v3 --- [refs] | 2 +- trunk/drivers/mmc/mmci.c | 2 +- trunk/drivers/mmc/mmci.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1a96caeafa2a..cb66941ba655 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9c091b47409255cefa1672041479d850b7b991a +refs/heads/master: f3e2628bed0d5a88ced8239b35f1534557f9631c diff --git a/trunk/drivers/mmc/mmci.c b/trunk/drivers/mmc/mmci.c index 6d161c70014a..2b10a2d4ae09 100644 --- a/trunk/drivers/mmc/mmci.c +++ b/trunk/drivers/mmc/mmci.c @@ -300,7 +300,7 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id, struct pt_regs *regs) /* * Unmap the buffer. */ - mmci_kunmap_atomic(host, &flags); + mmci_kunmap_atomic(host, buffer, &flags); host->sg_off += len; host->size -= len; diff --git a/trunk/drivers/mmc/mmci.h b/trunk/drivers/mmc/mmci.h index 4589bbd68192..6d7eadc9a678 100644 --- a/trunk/drivers/mmc/mmci.h +++ b/trunk/drivers/mmc/mmci.h @@ -172,8 +172,8 @@ static inline char *mmci_kmap_atomic(struct mmci_host *host, unsigned long *flag return kmap_atomic(sg->page, KM_BIO_SRC_IRQ) + sg->offset; } -static inline void mmci_kunmap_atomic(struct mmci_host *host, unsigned long *flags) +static inline void mmci_kunmap_atomic(struct mmci_host *host, void *buffer, unsigned long *flags) { - kunmap_atomic(host->sg_ptr->page, KM_BIO_SRC_IRQ); + kunmap_atomic(buffer, KM_BIO_SRC_IRQ); local_irq_restore(*flags); }