Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc71e479 authored by Adam Kropelin's avatar Adam Kropelin Committed by Greg Kroah-Hartman
Browse files

usb-serial: Fix edgeport regression on non-EPiC devices 



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: default avatarAdam Kropelin <akropel1@rochester.rr.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1060bce7

drivers/usb/serial/io_edgeport.c

+8 −11
Original line number Diff line number Diff line
@@ -2366,9 +2366,8 @@ static int send_cmd_write_baud_rate (struct edgeport_port *edge_port, int baudRa 
	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 (struct edgeport_port *edge_port, __u8 r 


	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;

	}