diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2010-03-05 16:43:45 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-06 14:26:43 -0500 |
commit | 752993ef8e40d1863b26c7dc51e12223588d0fe0 (patch) | |
tree | d2a6cf2a1d43edce0125fd2944e838062b20afe4 /drivers/mmc | |
parent | 5b27a1a566c5a4cce81d75107a0f130e43c6a5f8 (diff) |
mmc: at91_mci: correct kunmap_atomic()
kunmap_atomic() accepts a pointer to any location in the page so we do not
need the subtraction and cast.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Wolfgang Muees <wolfgang.mues@auerswald.de>
Cc: Andrew Victor <avictor.za@gmail.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/at91_mci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index 55507dacb789..91dc60cd032b 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c | |||
@@ -248,7 +248,7 @@ static inline void at91_mci_sg_to_dma(struct at91mci_host *host, struct mmc_data | |||
248 | dmabuf = (unsigned *)tmpv; | 248 | dmabuf = (unsigned *)tmpv; |
249 | } | 249 | } |
250 | 250 | ||
251 | kunmap_atomic(((void *)sgbuffer) - sg->offset, KM_BIO_SRC_IRQ); | 251 | kunmap_atomic(sgbuffer, KM_BIO_SRC_IRQ); |
252 | 252 | ||
253 | if (size == 0) | 253 | if (size == 0) |
254 | break; | 254 | break; |
@@ -313,7 +313,7 @@ static void at91_mci_post_dma_read(struct at91mci_host *host) | |||
313 | dmabuf = (unsigned *)tmpv; | 313 | dmabuf = (unsigned *)tmpv; |
314 | } | 314 | } |
315 | 315 | ||
316 | kunmap_atomic(((void *)sgbuffer)-sg->offset, KM_BIO_SRC_IRQ); | 316 | kunmap_atomic(sgbuffer, KM_BIO_SRC_IRQ); |
317 | dmac_flush_range((void *)sgbuffer, ((void *)sgbuffer) + amount); | 317 | dmac_flush_range((void *)sgbuffer, ((void *)sgbuffer) + amount); |
318 | data->bytes_xfered += amount; | 318 | data->bytes_xfered += amount; |
319 | if (size == 0) | 319 | if (size == 0) |