Commit 6a3ae841 authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman

USB: keyspan: pull in one indent level

We can remove the "if (urb->actual_length) {" check because checking for
"while (i < urb->actual_length) {" is sufficient.  This lets us pull the
code in one indent level.
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7ca2cd29
...@@ -726,10 +726,9 @@ static void usa49wg_indat_callback(struct urb *urb) ...@@ -726,10 +726,9 @@ static void usa49wg_indat_callback(struct urb *urb)
i = 0; i = 0;
len = 0; len = 0;
if (urb->actual_length) {
while (i < urb->actual_length) { while (i < urb->actual_length) {
/* Check port number from message*/ /* Check port number from message */
if (data[i] >= serial->num_ports) { if (data[i] >= serial->num_ports) {
dev_dbg(&urb->dev->dev, "%s - Unexpected port number %d\n", dev_dbg(&urb->dev->dev, "%s - Unexpected port number %d\n",
__func__, data[i]); __func__, data[i]);
...@@ -751,6 +750,7 @@ static void usa49wg_indat_callback(struct urb *urb) ...@@ -751,6 +750,7 @@ static void usa49wg_indat_callback(struct urb *urb)
*/ */
for (x = 0; x + 1 < len; x += 2) { for (x = 0; x + 1 < len; x += 2) {
int stat = data[i], flag = 0; int stat = data[i], flag = 0;
if (stat & RXERROR_OVERRUN) if (stat & RXERROR_OVERRUN)
flag |= TTY_OVERRUN; flag |= TTY_OVERRUN;
if (stat & RXERROR_FRAMING) if (stat & RXERROR_FRAMING)
...@@ -758,14 +758,13 @@ static void usa49wg_indat_callback(struct urb *urb) ...@@ -758,14 +758,13 @@ static void usa49wg_indat_callback(struct urb *urb)
if (stat & RXERROR_PARITY) if (stat & RXERROR_PARITY)
flag |= TTY_PARITY; flag |= TTY_PARITY;
/* XXX should handle break (0x10) */ /* XXX should handle break (0x10) */
tty_insert_flip_char(&port->port, tty_insert_flip_char(&port->port, data[i+1],
data[i+1], flag); flag);
i += 2; i += 2;
} }
} }
tty_flip_buffer_push(&port->port); tty_flip_buffer_push(&port->port);
} }
}
/* Resubmit urb so we continue receiving */ /* Resubmit urb so we continue receiving */
err = usb_submit_urb(urb, GFP_ATOMIC); err = usb_submit_urb(urb, GFP_ATOMIC);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment