diff options
Diffstat (limited to 'drivers/serial/cpm_uart')
| -rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_core.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c index 16af5626c243..b7bf4c698a47 100644 --- a/drivers/serial/cpm_uart/cpm_uart_core.c +++ b/drivers/serial/cpm_uart/cpm_uart_core.c | |||
| @@ -252,12 +252,9 @@ static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs) | |||
| 252 | /* If we have not enough room in tty flip buffer, then we try | 252 | /* If we have not enough room in tty flip buffer, then we try |
| 253 | * later, which will be the next rx-interrupt or a timeout | 253 | * later, which will be the next rx-interrupt or a timeout |
| 254 | */ | 254 | */ |
| 255 | if ((tty->flip.count + i) >= TTY_FLIPBUF_SIZE) { | 255 | if(tty_buffer_request_room(tty, i) < i) { |
| 256 | tty->flip.work.func((void *)tty); | 256 | printk(KERN_WARNING "No room in flip buffer\n"); |
| 257 | if ((tty->flip.count + i) >= TTY_FLIPBUF_SIZE) { | 257 | return; |
| 258 | printk(KERN_WARNING "TTY_DONT_FLIP set\n"); | ||
| 259 | return; | ||
| 260 | } | ||
| 261 | } | 258 | } |
| 262 | 259 | ||
| 263 | /* get pointer */ | 260 | /* get pointer */ |
| @@ -276,9 +273,7 @@ static void cpm_uart_int_rx(struct uart_port *port, struct pt_regs *regs) | |||
| 276 | continue; | 273 | continue; |
| 277 | 274 | ||
| 278 | error_return: | 275 | error_return: |
| 279 | *tty->flip.char_buf_ptr++ = ch; | 276 | tty_insert_flip_char(tty, ch, flg); |
| 280 | *tty->flip.flag_buf_ptr++ = flg; | ||
| 281 | tty->flip.count++; | ||
| 282 | 277 | ||
| 283 | } /* End while (i--) */ | 278 | } /* End while (i--) */ |
| 284 | 279 | ||
| @@ -908,7 +903,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { | |||
| 908 | .port = { | 903 | .port = { |
| 909 | .irq = SMC1_IRQ, | 904 | .irq = SMC1_IRQ, |
| 910 | .ops = &cpm_uart_pops, | 905 | .ops = &cpm_uart_pops, |
| 911 | .iotype = SERIAL_IO_MEM, | 906 | .iotype = UPIO_MEM, |
| 912 | .lock = SPIN_LOCK_UNLOCKED, | 907 | .lock = SPIN_LOCK_UNLOCKED, |
| 913 | }, | 908 | }, |
| 914 | .flags = FLAG_SMC, | 909 | .flags = FLAG_SMC, |
| @@ -922,7 +917,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { | |||
| 922 | .port = { | 917 | .port = { |
| 923 | .irq = SMC2_IRQ, | 918 | .irq = SMC2_IRQ, |
| 924 | .ops = &cpm_uart_pops, | 919 | .ops = &cpm_uart_pops, |
| 925 | .iotype = SERIAL_IO_MEM, | 920 | .iotype = UPIO_MEM, |
| 926 | .lock = SPIN_LOCK_UNLOCKED, | 921 | .lock = SPIN_LOCK_UNLOCKED, |
| 927 | }, | 922 | }, |
| 928 | .flags = FLAG_SMC, | 923 | .flags = FLAG_SMC, |
| @@ -939,7 +934,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { | |||
| 939 | .port = { | 934 | .port = { |
| 940 | .irq = SCC1_IRQ, | 935 | .irq = SCC1_IRQ, |
| 941 | .ops = &cpm_uart_pops, | 936 | .ops = &cpm_uart_pops, |
| 942 | .iotype = SERIAL_IO_MEM, | 937 | .iotype = UPIO_MEM, |
| 943 | .lock = SPIN_LOCK_UNLOCKED, | 938 | .lock = SPIN_LOCK_UNLOCKED, |
| 944 | }, | 939 | }, |
| 945 | .tx_nrfifos = TX_NUM_FIFO, | 940 | .tx_nrfifos = TX_NUM_FIFO, |
| @@ -953,7 +948,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { | |||
| 953 | .port = { | 948 | .port = { |
| 954 | .irq = SCC2_IRQ, | 949 | .irq = SCC2_IRQ, |
| 955 | .ops = &cpm_uart_pops, | 950 | .ops = &cpm_uart_pops, |
| 956 | .iotype = SERIAL_IO_MEM, | 951 | .iotype = UPIO_MEM, |
| 957 | .lock = SPIN_LOCK_UNLOCKED, | 952 | .lock = SPIN_LOCK_UNLOCKED, |
| 958 | }, | 953 | }, |
| 959 | .tx_nrfifos = TX_NUM_FIFO, | 954 | .tx_nrfifos = TX_NUM_FIFO, |
| @@ -967,7 +962,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { | |||
| 967 | .port = { | 962 | .port = { |
| 968 | .irq = SCC3_IRQ, | 963 | .irq = SCC3_IRQ, |
| 969 | .ops = &cpm_uart_pops, | 964 | .ops = &cpm_uart_pops, |
| 970 | .iotype = SERIAL_IO_MEM, | 965 | .iotype = UPIO_MEM, |
| 971 | .lock = SPIN_LOCK_UNLOCKED, | 966 | .lock = SPIN_LOCK_UNLOCKED, |
| 972 | }, | 967 | }, |
| 973 | .tx_nrfifos = TX_NUM_FIFO, | 968 | .tx_nrfifos = TX_NUM_FIFO, |
| @@ -981,7 +976,7 @@ struct uart_cpm_port cpm_uart_ports[UART_NR] = { | |||
| 981 | .port = { | 976 | .port = { |
| 982 | .irq = SCC4_IRQ, | 977 | .irq = SCC4_IRQ, |
| 983 | .ops = &cpm_uart_pops, | 978 | .ops = &cpm_uart_pops, |
| 984 | .iotype = SERIAL_IO_MEM, | 979 | .iotype = UPIO_MEM, |
| 985 | .lock = SPIN_LOCK_UNLOCKED, | 980 | .lock = SPIN_LOCK_UNLOCKED, |
| 986 | }, | 981 | }, |
| 987 | .tx_nrfifos = TX_NUM_FIFO, | 982 | .tx_nrfifos = TX_NUM_FIFO, |