History

Revert "serial: omap: unlock the port lock"

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.

Felipe Balbi committed 12 years ago

Commit 6bf78961 parent da64c271 file · +1 −4Browse files

Unified · Split

drivers/tty/serial/omap-serial.c+1−4
@@ -398,11 +398,8 @@ static void transmit_chars(struct uart_omap_port *up, unsigned int lsr) · 397 unmodified lines
398 break;398 break;
399 } while (--count > 0);399 } while (--count > 0);
400 400
401 if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) {401 if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
402 spin_unlock(&up->port.lock);
403 uart_write_wakeup(&up->port);402 uart_write_wakeup(&up->port);
404 spin_lock(&up->port.lock);
405 }
406 403
407 if (uart_circ_empty(xmit))404 if (uart_circ_empty(xmit))
408 serial_omap_stop_tx(&up->port);405 serial_omap_stop_tx(&up->port);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t