diff options
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/capi/capi.c | 4 | ||||
-rw-r--r-- | drivers/isdn/gigaset/ser-gigaset.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c index 2095153582f1..8a35029caca0 100644 --- a/drivers/isdn/capi/capi.c +++ b/drivers/isdn/capi/capi.c | |||
@@ -466,7 +466,7 @@ static int handle_recv_skb(struct capiminor *mp, struct sk_buff *skb) | |||
466 | ld = tty_ldisc_ref(mp->tty); | 466 | ld = tty_ldisc_ref(mp->tty); |
467 | if (ld == NULL) | 467 | if (ld == NULL) |
468 | return -1; | 468 | return -1; |
469 | if (ld->receive_buf == NULL) { | 469 | if (ld->ops->receive_buf == NULL) { |
470 | #if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS) | 470 | #if defined(_DEBUG_DATAFLOW) || defined(_DEBUG_TTYFUNCS) |
471 | printk(KERN_DEBUG "capi: ldisc has no receive_buf function\n"); | 471 | printk(KERN_DEBUG "capi: ldisc has no receive_buf function\n"); |
472 | #endif | 472 | #endif |
@@ -501,7 +501,7 @@ static int handle_recv_skb(struct capiminor *mp, struct sk_buff *skb) | |||
501 | printk(KERN_DEBUG "capi: DATA_B3_RESP %u len=%d => ldisc\n", | 501 | printk(KERN_DEBUG "capi: DATA_B3_RESP %u len=%d => ldisc\n", |
502 | datahandle, skb->len); | 502 | datahandle, skb->len); |
503 | #endif | 503 | #endif |
504 | ld->receive_buf(mp->tty, skb->data, NULL, skb->len); | 504 | ld->ops->receive_buf(mp->tty, skb->data, NULL, skb->len); |
505 | kfree_skb(skb); | 505 | kfree_skb(skb); |
506 | tty_ldisc_deref(ld); | 506 | tty_ldisc_deref(ld); |
507 | return 0; | 507 | return 0; |
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c index 45d1ee93cd39..5e89fa177816 100644 --- a/drivers/isdn/gigaset/ser-gigaset.c +++ b/drivers/isdn/gigaset/ser-gigaset.c | |||
@@ -766,7 +766,7 @@ gigaset_tty_wakeup(struct tty_struct *tty) | |||
766 | cs_put(cs); | 766 | cs_put(cs); |
767 | } | 767 | } |
768 | 768 | ||
769 | static struct tty_ldisc gigaset_ldisc = { | 769 | static struct tty_ldisc_ops gigaset_ldisc = { |
770 | .owner = THIS_MODULE, | 770 | .owner = THIS_MODULE, |
771 | .magic = TTY_LDISC_MAGIC, | 771 | .magic = TTY_LDISC_MAGIC, |
772 | .name = "ser_gigaset", | 772 | .name = "ser_gigaset", |