diff options
Diffstat (limited to 'drivers/usb/serial/keyspan.c')
| -rw-r--r-- | drivers/usb/serial/keyspan.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/drivers/usb/serial/keyspan.c b/drivers/usb/serial/keyspan.c index 97bc49f68efd..a4f5caebda43 100644 --- a/drivers/usb/serial/keyspan.c +++ b/drivers/usb/serial/keyspan.c | |||
| @@ -315,7 +315,7 @@ static void usa26_indat_callback(struct urb *urb) | |||
| 315 | else | 315 | else |
| 316 | err = 0; | 316 | err = 0; |
| 317 | for (i = 1; i < urb->actual_length ; ++i) | 317 | for (i = 1; i < urb->actual_length ; ++i) |
| 318 | tty_insert_flip_char(tty, data[i], err); | 318 | tty_insert_flip_char(&port->port, data[i], err); |
| 319 | } else { | 319 | } else { |
| 320 | /* some bytes had errors, every byte has status */ | 320 | /* some bytes had errors, every byte has status */ |
| 321 | dev_dbg(&port->dev, "%s - RX error!!!!\n", __func__); | 321 | dev_dbg(&port->dev, "%s - RX error!!!!\n", __func__); |
| @@ -328,7 +328,8 @@ static void usa26_indat_callback(struct urb *urb) | |||
| 328 | if (stat & RXERROR_PARITY) | 328 | if (stat & RXERROR_PARITY) |
| 329 | flag |= TTY_PARITY; | 329 | flag |= TTY_PARITY; |
| 330 | /* XXX should handle break (0x10) */ | 330 | /* XXX should handle break (0x10) */ |
| 331 | tty_insert_flip_char(tty, data[i+1], flag); | 331 | tty_insert_flip_char(&port->port, data[i+1], |
| 332 | flag); | ||
| 332 | } | 333 | } |
| 333 | } | 334 | } |
| 334 | tty_flip_buffer_push(tty); | 335 | tty_flip_buffer_push(tty); |
| @@ -700,7 +701,8 @@ static void usa49_indat_callback(struct urb *urb) | |||
| 700 | if (stat & RXERROR_PARITY) | 701 | if (stat & RXERROR_PARITY) |
| 701 | flag |= TTY_PARITY; | 702 | flag |= TTY_PARITY; |
| 702 | /* XXX should handle break (0x10) */ | 703 | /* XXX should handle break (0x10) */ |
| 703 | tty_insert_flip_char(tty, data[i+1], flag); | 704 | tty_insert_flip_char(&port->port, data[i+1], |
| 705 | flag); | ||
| 704 | } | 706 | } |
| 705 | } | 707 | } |
| 706 | tty_flip_buffer_push(tty); | 708 | tty_flip_buffer_push(tty); |
| @@ -751,7 +753,8 @@ static void usa49wg_indat_callback(struct urb *urb) | |||
| 751 | /* no error on any byte */ | 753 | /* no error on any byte */ |
| 752 | i++; | 754 | i++; |
| 753 | for (x = 1; x < len ; ++x) | 755 | for (x = 1; x < len ; ++x) |
| 754 | tty_insert_flip_char(tty, data[i++], 0); | 756 | tty_insert_flip_char(&port->port, |
| 757 | data[i++], 0); | ||
| 755 | } else { | 758 | } else { |
| 756 | /* | 759 | /* |
| 757 | * some bytes had errors, every byte has status | 760 | * some bytes had errors, every byte has status |
| @@ -765,7 +768,7 @@ static void usa49wg_indat_callback(struct urb *urb) | |||
| 765 | if (stat & RXERROR_PARITY) | 768 | if (stat & RXERROR_PARITY) |
| 766 | flag |= TTY_PARITY; | 769 | flag |= TTY_PARITY; |
| 767 | /* XXX should handle break (0x10) */ | 770 | /* XXX should handle break (0x10) */ |
| 768 | tty_insert_flip_char(tty, | 771 | tty_insert_flip_char(&port->port, |
| 769 | data[i+1], flag); | 772 | data[i+1], flag); |
| 770 | i += 2; | 773 | i += 2; |
| 771 | } | 774 | } |
| @@ -824,8 +827,8 @@ static void usa90_indat_callback(struct urb *urb) | |||
| 824 | else | 827 | else |
| 825 | err = 0; | 828 | err = 0; |
| 826 | for (i = 1; i < urb->actual_length ; ++i) | 829 | for (i = 1; i < urb->actual_length ; ++i) |
| 827 | tty_insert_flip_char(tty, data[i], | 830 | tty_insert_flip_char(&port->port, |
| 828 | err); | 831 | data[i], err); |
| 829 | } else { | 832 | } else { |
| 830 | /* some bytes had errors, every byte has status */ | 833 | /* some bytes had errors, every byte has status */ |
| 831 | dev_dbg(&port->dev, "%s - RX error!!!!\n", __func__); | 834 | dev_dbg(&port->dev, "%s - RX error!!!!\n", __func__); |
| @@ -838,8 +841,8 @@ static void usa90_indat_callback(struct urb *urb) | |||
| 838 | if (stat & RXERROR_PARITY) | 841 | if (stat & RXERROR_PARITY) |
| 839 | flag |= TTY_PARITY; | 842 | flag |= TTY_PARITY; |
| 840 | /* XXX should handle break (0x10) */ | 843 | /* XXX should handle break (0x10) */ |
| 841 | tty_insert_flip_char(tty, data[i+1], | 844 | tty_insert_flip_char(&port->port, |
| 842 | flag); | 845 | data[i+1], flag); |
| 843 | } | 846 | } |
| 844 | } | 847 | } |
| 845 | } | 848 | } |