diff options
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/capi/capi.c | 7 | ||||
-rw-r--r-- | drivers/isdn/gigaset/interface.c | 6 | ||||
-rw-r--r-- | drivers/isdn/i4l/isdn_tty.c | 3 |
3 files changed, 2 insertions, 14 deletions
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index 89562a845f6a..ac6f72b455d1 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c | |||
@@ -569,7 +569,6 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb) | |||
569 | { | 569 | { |
570 | struct capidev *cdev = ap->private; | 570 | struct capidev *cdev = ap->private; |
571 | #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE | 571 | #ifdef CONFIG_ISDN_CAPI_MIDDLEWARE |
572 | struct tty_struct *tty; | ||
573 | struct capiminor *mp; | 572 | struct capiminor *mp; |
574 | u16 datahandle; | 573 | u16 datahandle; |
575 | struct capincci *np; | 574 | struct capincci *np; |
@@ -627,11 +626,7 @@ static void capi_recv_message(struct capi20_appl *ap, struct sk_buff *skb) | |||
627 | CAPIMSG_U16(skb->data, CAPIMSG_BASELEN + 4 + 2)); | 626 | CAPIMSG_U16(skb->data, CAPIMSG_BASELEN + 4 + 2)); |
628 | kfree_skb(skb); | 627 | kfree_skb(skb); |
629 | capiminor_del_ack(mp, datahandle); | 628 | capiminor_del_ack(mp, datahandle); |
630 | tty = tty_port_tty_get(&mp->port); | 629 | tty_port_tty_wakeup(&mp->port); |
631 | if (tty) { | ||
632 | tty_wakeup(tty); | ||
633 | tty_kref_put(tty); | ||
634 | } | ||
635 | handle_minor_send(mp); | 630 | handle_minor_send(mp); |
636 | 631 | ||
637 | } else { | 632 | } else { |
diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c index e2b539675b66..600c79b030cd 100644 --- a/drivers/isdn/gigaset/interface.c +++ b/drivers/isdn/gigaset/interface.c | |||
@@ -487,12 +487,8 @@ static const struct tty_operations if_ops = { | |||
487 | static void if_wake(unsigned long data) | 487 | static void if_wake(unsigned long data) |
488 | { | 488 | { |
489 | struct cardstate *cs = (struct cardstate *)data; | 489 | struct cardstate *cs = (struct cardstate *)data; |
490 | struct tty_struct *tty = tty_port_tty_get(&cs->port); | ||
491 | 490 | ||
492 | if (tty) { | 491 | tty_port_tty_wakeup(&cs->port); |
493 | tty_wakeup(tty); | ||
494 | tty_kref_put(tty); | ||
495 | } | ||
496 | } | 492 | } |
497 | 493 | ||
498 | /*** interface to common ***/ | 494 | /*** interface to common ***/ |
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c index ebaebdf30f98..b72afd81a7bb 100644 --- a/drivers/isdn/i4l/isdn_tty.c +++ b/drivers/isdn/i4l/isdn_tty.c | |||
@@ -1472,9 +1472,6 @@ isdn_tty_set_termios(struct tty_struct *tty, struct ktermios *old_termios) | |||
1472 | tty->termios.c_ospeed == old_termios->c_ospeed) | 1472 | tty->termios.c_ospeed == old_termios->c_ospeed) |
1473 | return; | 1473 | return; |
1474 | isdn_tty_change_speed(info); | 1474 | isdn_tty_change_speed(info); |
1475 | if ((old_termios->c_cflag & CRTSCTS) && | ||
1476 | !(tty->termios.c_cflag & CRTSCTS)) | ||
1477 | tty->hw_stopped = 0; | ||
1478 | } | 1475 | } |
1479 | } | 1476 | } |
1480 | 1477 | ||