diff options
| author | Johan Hovold <johan@kernel.org> | 2018-06-26 15:43:13 +0200 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2018-06-27 07:59:03 +0200 |
| commit | 1d1de580a3e0b1cfacd63b4093573d8f327b0a1a (patch) | |
| tree | e9a764686d7d279cbf49b6a07130ea043c896f2b | |
| parent | a323f94611aac0f68b710048ae53c73a53b5c7b5 (diff) | |
| download | linux-stable-1d1de580a3e0b1cfacd63b4093573d8f327b0a1a.tar.gz linux-stable-1d1de580a3e0b1cfacd63b4093573d8f327b0a1a.tar.bz2 linux-stable-1d1de580a3e0b1cfacd63b4093573d8f327b0a1a.zip | |
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>
| -rw-r--r-- | drivers/usb/serial/digi_acceleport.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index ae512fed08af..e7f244cf2c07 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c @@ -1387,7 +1387,7 @@ static int digi_read_inb_callback(struct urb *urb) int len; int port_status; unsigned char *data; - int flag, throttled; + int tty_flag, throttled; /* short/multiple packet check */ if (urb->actual_length < 2) { @@ -1423,7 +1423,7 @@ static int digi_read_inb_callback(struct urb *urb) data = &buf[3]; /* get flag from port_status */ - flag = 0; + tty_flag = 0; /* overrun is special, not associated with a char */ if (port_status & DIGI_OVERRUN_ERROR) @@ -1432,17 +1432,17 @@ static int digi_read_inb_callback(struct urb *urb) /* break takes precedence over parity, */ /* which takes precedence over framing errors */ if (port_status & DIGI_BREAK_ERROR) - flag = TTY_BREAK; + tty_flag = TTY_BREAK; else if (port_status & DIGI_PARITY_ERROR) - flag = TTY_PARITY; + tty_flag = TTY_PARITY; 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) */ --len; if (len > 0) { tty_insert_flip_string_fixed_flag(&port->port, data, - flag, len); + tty_flag, len); tty_flip_buffer_push(&port->port); } } |