[MMC] mmci: kunmap_atomic() unmaps virtual address, not page

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c
index 6d161c70014ae6bfffa67cdfd02b08010ae79150..2b10a2d4ae099f9a7c1d44829c54b80431c862f4 100644 (file)
--- a/drivers/mmc/mmci.c
+++ b/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/drivers/mmc/mmci.h b/drivers/mmc/mmci.h
index 4589bbd6819279901e961bf7b3a29a621c005051..6d7eadc9a6789b5e354b70c12a7e9d62d08526c1 100644 (file)
--- a/drivers/mmc/mmci.h
+++ b/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);
 }