aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn
diff options
context:
space:
mode:
authorTilman Schmidt <tilman@imap.cc>2010-07-05 10:18:27 -0400
committerDavid S. Miller <davem@davemloft.net>2010-07-05 22:41:23 -0400
commitbc10f96757bd6ab3721510df8defa8f21c32f974 (patch)
tree35d5ec90646cc73952287ee006d92e58e793a0fd /drivers/isdn
parent831334cbbbdc2b2923513104e6e70c80dda0bff0 (diff)
isdn: avoid calling tty_ldisc_flush() in atomic context
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. Signed-off-by: Tilman Schmidt <tilman@imap.cc> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r--drivers/isdn/i4l/isdn_tty.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index fc8454d2eea5..51dc60da333b 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)
2636 if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) { 2636 if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) {
2637 return; 2637 return;
2638 } 2638 }
2639#ifdef CONFIG_ISDN_AUDIO
2640 if ( !info->vonline )
2641 tty_ldisc_flush(info->tty);
2642#else
2643 tty_ldisc_flush(info->tty);
2644#endif
2645 if ((info->flags & ISDN_ASYNC_CHECK_CD) && 2639 if ((info->flags & ISDN_ASYNC_CHECK_CD) &&
2646 (!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) && 2640 (!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) &&
2647 (info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) { 2641 (info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) {