| Message ID | 20100705-patch-isdn-02.tilman@imap.cc |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Tilman Schmidt <tilman@imap.cc> Date: Tue, 6 Jul 2010 02:18:27 +0200 (CEST) > Remove the call to tty_ldisc_flush() from the RESULT_NO_CARRIER > branch of isdn_tty_modem_result(), as already proposed in commit > 00409bb045887ec5e7b9e351bc080c38ab6bfd33. > This avoids a "sleeping function called from invalid context" BUG > when the hardware driver calls the statcallb() callback with > command==ISDN_STAT_DHUP in atomic context, which in turn calls > isdn_tty_modem_result(RESULT_NO_CARRIER, ~), and from there, > tty_ldisc_flush() which may sleep. > > Impact: bugfix > Signed-off-by: Tilman Schmidt <tilman@imap.cc> Applied to net-next-2.6, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c index fc8454d..51dc60d 100644 --- a/drivers/isdn/i4l/isdn_tty.c +++ b/drivers/isdn/i4l/isdn_tty.c @@ -2636,12 +2636,6 @@ isdn_tty_modem_result(int code, modem_info * info) if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) { return; } -#ifdef CONFIG_ISDN_AUDIO - if ( !info->vonline ) - tty_ldisc_flush(info->tty); -#else - tty_ldisc_flush(info->tty); -#endif if ((info->flags & ISDN_ASYNC_CHECK_CD) && (!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) && (info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) {
Remove the call to tty_ldisc_flush() from the RESULT_NO_CARRIER branch of isdn_tty_modem_result(), as already proposed in commit 00409bb045887ec5e7b9e351bc080c38ab6bfd33. This avoids a "sleeping function called from invalid context" BUG when the hardware driver calls the statcallb() callback with command==ISDN_STAT_DHUP in atomic context, which in turn calls isdn_tty_modem_result(RESULT_NO_CARRIER, ~), and from there, tty_ldisc_flush() which may sleep. Impact: bugfix Signed-off-by: Tilman Schmidt <tilman@imap.cc> --- drivers/isdn/i4l/isdn_tty.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)