mmc: fix the use of kunmap_atomic() in tmio_mmc.h
kunmap_atomic() takes the cookie, returned by the kmap_atomic() as its argument and not the page address, used as an argument to kmap_atomic(). This patch fixes the compile error: In file included from drivers/mmc/host/tmio_mmc.c:37: drivers/mmc/host/tmio_mmc.h: In function 'tmio_mmc_kunmap_atomic': drivers/mmc/host/tmio_mmc.h:192: error: negative width in bit-field '<anonymous>' Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Eric Miao <eric.y.miao@gmail.com> Tested-by: Magnus Damm <damm@opensource.se> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
b78d6c5f51
commit
5600efb1bc
|
@ -164,6 +164,7 @@ tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command *cmd)
|
|||
static void tmio_mmc_pio_irq(struct tmio_mmc_host *host)
|
||||
{
|
||||
struct mmc_data *data = host->data;
|
||||
void *sg_virt;
|
||||
unsigned short *buf;
|
||||
unsigned int count;
|
||||
unsigned long flags;
|
||||
|
@ -173,8 +174,8 @@ static void tmio_mmc_pio_irq(struct tmio_mmc_host *host)
|
|||
return;
|
||||
}
|
||||
|
||||
buf = (unsigned short *)(tmio_mmc_kmap_atomic(host, &flags) +
|
||||
host->sg_off);
|
||||
sg_virt = tmio_mmc_kmap_atomic(host->sg_ptr, &flags);
|
||||
buf = (unsigned short *)(sg_virt + host->sg_off);
|
||||
|
||||
count = host->sg_ptr->length - host->sg_off;
|
||||
if (count > data->blksz)
|
||||
|
@ -191,7 +192,7 @@ static void tmio_mmc_pio_irq(struct tmio_mmc_host *host)
|
|||
|
||||
host->sg_off += count;
|
||||
|
||||
tmio_mmc_kunmap_atomic(host, &flags);
|
||||
tmio_mmc_kunmap_atomic(sg_virt, &flags);
|
||||
|
||||
if (host->sg_off == host->sg_ptr->length)
|
||||
tmio_mmc_next_sg(host);
|
||||
|
|
|
@ -174,19 +174,17 @@ static inline int tmio_mmc_next_sg(struct tmio_mmc_host *host)
|
|||
return --host->sg_len;
|
||||
}
|
||||
|
||||
static inline char *tmio_mmc_kmap_atomic(struct tmio_mmc_host *host,
|
||||
static inline char *tmio_mmc_kmap_atomic(struct scatterlist *sg,
|
||||
unsigned long *flags)
|
||||
{
|
||||
struct scatterlist *sg = host->sg_ptr;
|
||||
|
||||
local_irq_save(*flags);
|
||||
return kmap_atomic(sg_page(sg), KM_BIO_SRC_IRQ) + sg->offset;
|
||||
}
|
||||
|
||||
static inline void tmio_mmc_kunmap_atomic(struct tmio_mmc_host *host,
|
||||
static inline void tmio_mmc_kunmap_atomic(void *virt,
|
||||
unsigned long *flags)
|
||||
{
|
||||
kunmap_atomic(sg_page(host->sg_ptr), KM_BIO_SRC_IRQ);
|
||||
kunmap_atomic(virt, KM_BIO_SRC_IRQ);
|
||||
local_irq_restore(*flags);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue