hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

USB: serial: digi_acceleport: rename tty flag variable 

Add a "tty_" prefix to the tty "flag" variable to avoid any future
mixups with the recently added irq-mask "flags" one.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2018-06-26 15:43:13 +02:00
parent a323f94611
commit 1d1de580a3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/serial/digi_acceleport.c
View File

@ -1387,7 +1387,7 @@ static int digi_read_inb_callback(struct urb *urb)
int len; int len;
int port_status; int port_status;
unsigned char *data; unsigned char *data;
int flag, throttled; int tty_flag, throttled;
/* short/multiple packet check */ /* short/multiple packet check */
if (urb->actual_length < 2) { if (urb->actual_length < 2) {
@ -1423,7 +1423,7 @@ static int digi_read_inb_callback(struct urb *urb)
data = &buf[3]; data = &buf[3];
/* get flag from port_status */ /* get flag from port_status */
flag = 0; tty_flag = 0;
/* overrun is special, not associated with a char */ /* overrun is special, not associated with a char */
if (port_status & DIGI_OVERRUN_ERROR) if (port_status & DIGI_OVERRUN_ERROR)
@ -1432,17 +1432,17 @@ static int digi_read_inb_callback(struct urb *urb)
/* break takes precedence over parity, */ /* break takes precedence over parity, */
/* which takes precedence over framing errors */ /* which takes precedence over framing errors */
if (port_status & DIGI_BREAK_ERROR) if (port_status & DIGI_BREAK_ERROR)
flag = TTY_BREAK; tty_flag = TTY_BREAK;
else if (port_status & DIGI_PARITY_ERROR) else if (port_status & DIGI_PARITY_ERROR)
flag = TTY_PARITY; tty_flag = TTY_PARITY;
else if (port_status & DIGI_FRAMING_ERROR) else if (port_status & DIGI_FRAMING_ERROR)
flag = TTY_FRAME; tty_flag = TTY_FRAME;
/* data length is len-1 (one byte of len is port_status) */ /* data length is len-1 (one byte of len is port_status) */
--len; --len;
if (len > 0) { if (len > 0) {
tty_insert_flip_string_fixed_flag(&port->port, data, tty_insert_flip_string_fixed_flag(&port->port, data,
flag, len); tty_flag, len);
tty_flip_buffer_push(&port->port); tty_flip_buffer_push(&port->port);
} }
} }