s3cmci: Fix hangup in do_pio_write()
PATCH 1/1 s3cmci: Fix hangup in do_pio_write()
This commit fixes the regression what was added by commit 088a78af978d0c8e339071a9b2bca1f4cb368f30 "s3cmci: Support transfers which are not multiple of 32 bits."
fifo_free() now returns amount of available space in FIFO buffer in bytes. But do_pio_write() writes to FIFO 32-bit words. Condition for return from cycle is (fifo_free() == 0), but when fifo has 1..3 bytes of free space then this condition will never be true and system hangs.
This patch changes condition in the while() to (fifo_free() > 3).
--- drivers/mmc/host/s3cmci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/mmc/host/s3cmci.c +1 -1
@@ -329,7 +329,7 @@ static void do_pio_write(struct s3cmci_host *host) to_ptr = host->base + host->sdidata; -while ((fifo =fifo_free (host))) { +while ((fifo =fifo_free (host)) >3 ) {if (!host->pio_bytes) { res =get_data_buffer (host, &host->pio_bytes, &host->pio_ptr);
Signature · 1 line
1.5.6.5
Quoted 4 lines · On Thu, 1 Jan 2009 13:09:04 +0200 Yauhen Kharuzhy <[email protected]> wrote:
This commit fixes the regression what was added by commit
088a78af978d0c8e339071a9b2bca1f4cb368f30"s3cmci: Support transfers which are not multiple of 32 bits."
Quoted 8 lines
fifo_free()now returns amount of available space in FIFO buffer in bytes. Butdo_pio_write()writes to FIFO 32-bit words. Condition for return from cycle is (fifo_free()== 0), but when fifo has 1..3 bytes of free space then this condition will never be true and system hangs.This patch changes condition in the
while()to (fifo_free()> 3).Signed-off-by Yauhen Kharuzhy <[email protected]>
Any objections here Ben? An Acked-by would be nice.
Rgds
Signature · 9 lines
-- Pierre Ossman Linux kernel, MMC maintainer http://www.kernel.org rdesktop, core developer http://www.rdesktop.org WARNING: This correspondence is being monitored by the Swedish government. Make sure your server uses encryption for SMTP traffic and consider using PGP for end-to-end encryption.