mirror of
https://github.com/followmsi/android_kernel_google_msm.git
synced 2024-11-06 23:17:41 +00:00
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
00409bb045
.
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>
This commit is contained in:
parent
831334cbbb
commit
bc10f96757
1 changed files with 0 additions and 6 deletions
|
@ -2636,12 +2636,6 @@ isdn_tty_modem_result(int code, modem_info * info)
|
||||||
if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) {
|
if ((info->flags & ISDN_ASYNC_CLOSING) || (!info->tty)) {
|
||||||
return;
|
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) &&
|
if ((info->flags & ISDN_ASYNC_CHECK_CD) &&
|
||||||
(!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) &&
|
(!((info->flags & ISDN_ASYNC_CALLOUT_ACTIVE) &&
|
||||||
(info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) {
|
(info->flags & ISDN_ASYNC_CALLOUT_NOHUP)))) {
|
||||||
|
|
Loading…
Reference in a new issue