USB: mos7840: test and propagate set_uart_reg return value
The test for an mos7840_set_uart_reg() error return value only works when status is signed. propagate its error value. Signed-off-by: Roel Kluin <12o3l@tiscali.nl> Cc: SL Baur <steve@xemacs.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
28ffd79c31
commit
87521c46f6
@ -1713,7 +1713,7 @@ static int mos7840_tiocmset(struct usb_serial_port *port, struct file *file,
|
|||||||
{
|
{
|
||||||
struct moschip_port *mos7840_port;
|
struct moschip_port *mos7840_port;
|
||||||
unsigned int mcr;
|
unsigned int mcr;
|
||||||
unsigned int status;
|
int status;
|
||||||
|
|
||||||
dbg("%s - port %d", __func__, port->number);
|
dbg("%s - port %d", __func__, port->number);
|
||||||
|
|
||||||
@ -1740,11 +1740,10 @@ static int mos7840_tiocmset(struct usb_serial_port *port, struct file *file,
|
|||||||
|
|
||||||
mos7840_port->shadowMCR = mcr;
|
mos7840_port->shadowMCR = mcr;
|
||||||
|
|
||||||
status = 0;
|
|
||||||
status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER, mcr);
|
status = mos7840_set_uart_reg(port, MODEM_CONTROL_REGISTER, mcr);
|
||||||
if (status < 0) {
|
if (status < 0) {
|
||||||
dbg("setting MODEM_CONTROL_REGISTER Failed\n");
|
dbg("setting MODEM_CONTROL_REGISTER Failed\n");
|
||||||
return -1;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Reference in New Issue
Block a user