lkml.org 
[lkml]   [2007]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[2.6.22.2 review 22/84] usb-serial: Fix edgeport regression on non-EPiC devices

    From: Adam Kropelin <akropel1@rochester.rr.com>

    Fix serious regression on non-EPiC edgeport usb-serial devices. Baud
    rate and MCR/LCR registers are not being written on these models due
    to apparent copy-n-paste errors introduced with EPiC support.

    Failure reported by Nick Pasich <Nick@NickAndBarb.net>.

    Signed-off-by: Adam Kropelin <akropel1@rochester.rr.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/usb/serial/io_edgeport.c | 19 ++++++++-----------
    1 file changed, 8 insertions(+), 11 deletions(-)

    --- a/drivers/usb/serial/io_edgeport.c
    +++ b/drivers/usb/serial/io_edgeport.c
    @@ -2366,9 +2366,8 @@ static int send_cmd_write_baud_rate (str
    int status;
    unsigned char number = edge_port->port->number - edge_port->port->serial->minor;

    - if ((!edge_serial->is_epic) ||
    - ((edge_serial->is_epic) &&
    - (!edge_serial->epic_descriptor.Supports.IOSPSetBaudRate))) {
    + if (edge_serial->is_epic &&
    + !edge_serial->epic_descriptor.Supports.IOSPSetBaudRate) {
    dbg("SendCmdWriteBaudRate - NOT Setting baud rate for port = %d, baud = %d",
    edge_port->port->number, baudRate);
    return 0;
    @@ -2461,18 +2460,16 @@ static int send_cmd_write_uart_register

    dbg("%s - write to %s register 0x%02x", (regNum == MCR) ? "MCR" : "LCR", __FUNCTION__, regValue);

    - if ((!edge_serial->is_epic) ||
    - ((edge_serial->is_epic) &&
    - (!edge_serial->epic_descriptor.Supports.IOSPWriteMCR) &&
    - (regNum == MCR))) {
    + if (edge_serial->is_epic &&
    + !edge_serial->epic_descriptor.Supports.IOSPWriteMCR &&
    + regNum == MCR) {
    dbg("SendCmdWriteUartReg - Not writing to MCR Register");
    return 0;
    }

    - if ((!edge_serial->is_epic) ||
    - ((edge_serial->is_epic) &&
    - (!edge_serial->epic_descriptor.Supports.IOSPWriteLCR) &&
    - (regNum == LCR))) {
    + if (edge_serial->is_epic &&
    + !edge_serial->epic_descriptor.Supports.IOSPWriteLCR &&
    + regNum == LCR) {
    dbg ("SendCmdWriteUartReg - Not writing to LCR Register");
    return 0;
    }
    --
    -
    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: 2007-08-07 23:03    [W:0.026 / U:157.548 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site