lkml.org 
[lkml]   [2010]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 46/49] serial/imx: check that the buffer is non-empty before sending it out
    Date
    From: Volker Ernst <volker.ernst@txtr.com>

    The .start_tx callback (imx_start_tx here) isn't only called when the
    buffer is non-empty. E.g. after resume or when handshaking is enabled
    and the other side starts to signal being ready.

    So check for an empty puffer already before sending the first character.
    This prevents sending out stale (or uninitialised) data.

    Signed-off-by: Volker Ernst <volker.ernst@txtr.com>
    Signed-off-by: Daniel Mack <daniel@caiaq.de>
    Cc: Andy Green <andy@warmcat.com>
    [ukl: reword commit log, put check in while condition]
    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/serial/imx.c | 5 ++---
    1 files changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c
    index 66ecc7a..dfcf4b1 100644
    --- a/drivers/serial/imx.c
    +++ b/drivers/serial/imx.c
    @@ -327,14 +327,13 @@ static inline void imx_transmit_buffer(struct imx_port *sport)
    {
    struct circ_buf *xmit = &sport->port.state->xmit;

    - while (!(readl(sport->port.membase + UTS) & UTS_TXFULL)) {
    + while (!uart_circ_empty(xmit) &&
    + !(readl(sport->port.membase + UTS) & UTS_TXFULL)) {
    /* send xmit->buf[xmit->tail]
    * out the port here */
    writel(xmit->buf[xmit->tail], sport->port.membase + URTX0);
    xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1);
    sport->port.icount.tx++;
    - if (uart_circ_empty(xmit))
    - break;
    }

    if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
    --
    1.7.2
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2010-10-22 20:35    [W:0.022 / U:1.692 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site