diff options
| -rw-r--r-- | drivers/tty/n_tty.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index 05e72bea9b07..7fbad56db7c9 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c | |||
| @@ -189,21 +189,6 @@ static void put_tty_queue(unsigned char c, struct n_tty_data *ldata) | |||
| 189 | } | 189 | } |
| 190 | 190 | ||
| 191 | /** | 191 | /** |
| 192 | * check_unthrottle - allow new receive data | ||
| 193 | * @tty; tty device | ||
| 194 | * | ||
| 195 | * Check whether to call the driver unthrottle functions | ||
| 196 | * | ||
| 197 | * Can sleep, may be called under the atomic_read_lock mutex but | ||
| 198 | * this is not guaranteed. | ||
| 199 | */ | ||
| 200 | static void check_unthrottle(struct tty_struct *tty) | ||
| 201 | { | ||
| 202 | if (tty->count) | ||
| 203 | tty_unthrottle(tty); | ||
| 204 | } | ||
| 205 | |||
| 206 | /** | ||
| 207 | * reset_buffer_flags - reset buffer state | 192 | * reset_buffer_flags - reset buffer state |
| 208 | * @tty: terminal to reset | 193 | * @tty: terminal to reset |
| 209 | * | 194 | * |
| @@ -1961,7 +1946,8 @@ do_it_again: | |||
| 1961 | */ | 1946 | */ |
| 1962 | if (n_tty_chars_in_buffer(tty) <= TTY_THRESHOLD_UNTHROTTLE) { | 1947 | if (n_tty_chars_in_buffer(tty) <= TTY_THRESHOLD_UNTHROTTLE) { |
| 1963 | n_tty_set_room(tty); | 1948 | n_tty_set_room(tty); |
| 1964 | check_unthrottle(tty); | 1949 | if (tty->count) |
| 1950 | tty_unthrottle(tty); | ||
| 1965 | } | 1951 | } |
| 1966 | 1952 | ||
| 1967 | if (b - buf >= minimum) | 1953 | if (b - buf >= minimum) |
