This reverts commit 0324a821029e1f54e7a7f8fed48693cfce42dc0e. That commit tried to fix a deadlock problem when using hci_ldisc, but it turns out the bug was in hci_ldsic all along where it was calling ->write() from within ->write_wakeup() callback. The problem is that ->write_wakeup() was called with port lock held and ->write() tried to grab the same port lock.
Unified · Split
| @@ -398,11 +398,8 @@ static void transmit_chars(struct uart_omap_port *up, unsigned int lsr) · 397 unmodified lines | ||
| 398 | 398 | break; |
| 399 | 399 | } while (--count > 0); |
| 400 | 400 | |
| 401 | − if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) { | |
| 402 | − spin_unlock(&up->port.lock); | |
| 401 | + if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) | |
| 403 | 402 | uart_write_wakeup(&up->port); |
| 404 | − spin_lock(&up->port.lock); | |
| 405 | − } | |
| 406 | 403 | |
| 407 | 404 | if (uart_circ_empty(xmit)) |
| 408 | 405 | serial_omap_stop_tx(&up->port); |