lkml.org 
[lkml]   [2012]   [Oct]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 126/180] usb: serial: mos7840: Fixup mos7840_chars_in_buffer()
    2.6.32-longterm review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mark Ferrell <mferrell@uplogix.com>

    commit 5c263b92f828af6a8cf54041db45ceae5af8f2ab upstream.

    * Use the buffer content length as opposed to the total buffer size. This can
    be a real problem when using the mos7840 as a usb serial-console as all
    kernel output is truncated during boot.

    Signed-off-by: Mark Ferrell <mferrell@uplogix.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Willy Tarreau <w@1wt.eu>
    ---
    drivers/usb/serial/mos7840.c | 9 ++++++---
    1 files changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
    index 9fdcee2..61829b8 100644
    --- a/drivers/usb/serial/mos7840.c
    +++ b/drivers/usb/serial/mos7840.c
    @@ -1181,9 +1181,12 @@ static int mos7840_chars_in_buffer(struct tty_struct *tty)
    }

    spin_lock_irqsave(&mos7840_port->pool_lock, flags);
    - for (i = 0; i < NUM_URBS; ++i)
    - if (mos7840_port->busy[i])
    - chars += URB_TRANSFER_BUFFER_SIZE;
    + for (i = 0; i < NUM_URBS; ++i) {
    + if (mos7840_port->busy[i]) {
    + struct urb *urb = mos7840_port->write_urb_pool[i];
    + chars += urb->transfer_buffer_length;
    + }
    + }
    spin_unlock_irqrestore(&mos7840_port->pool_lock, flags);
    dbg("%s - returns %d", __func__, chars);
    return chars;
    --
    1.7.2.1.45.g54fbc




    \
     
     \ /
      Last update: 2012-10-02 02:21    [W:3.200 / U:0.420 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site