---

yaml --- r: 16727 b: refs/heads/master c: f3e2628 h: refs/heads/master i: 16725: 7f847bb 16723: 906bf64 16719: f505c46 v: v3
git-mirror · Jan 5, 2006 · a96bf40 · a96bf40
1 parent 71937b0
commit a96bf40
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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);
 }