Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

isdn: switch to int put_char method

Signed-off-by: Alan Cox <alan@redhat.com>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Alan Cox and committed by
Linus Torvalds
f2545a75 5d19f546

+6 -3
+6 -3
drivers/isdn/capi/capi.c
··· 1111 1111 return count; 1112 1112 } 1113 1113 1114 - static void capinc_tty_put_char(struct tty_struct *tty, unsigned char ch) 1114 + static int capinc_tty_put_char(struct tty_struct *tty, unsigned char ch) 1115 1115 { 1116 1116 struct capiminor *mp = (struct capiminor *)tty->driver_data; 1117 1117 struct sk_buff *skb; 1118 1118 unsigned long flags; 1119 + int ret = 1; 1119 1120 1120 1121 #ifdef _DEBUG_TTYFUNCS 1121 1122 printk(KERN_DEBUG "capinc_put_char(%u)\n", ch); ··· 1126 1125 #ifdef _DEBUG_TTYFUNCS 1127 1126 printk(KERN_DEBUG "capinc_tty_put_char: mp or mp->ncci NULL\n"); 1128 1127 #endif 1129 - return; 1128 + return 0; 1130 1129 } 1131 1130 1132 1131 spin_lock_irqsave(&workaround_lock, flags); ··· 1135 1134 if (skb_tailroom(skb) > 0) { 1136 1135 *(skb_put(skb, 1)) = ch; 1137 1136 spin_unlock_irqrestore(&workaround_lock, flags); 1138 - return; 1137 + return 1; 1139 1138 } 1140 1139 mp->ttyskb = NULL; 1141 1140 skb_queue_tail(&mp->outqueue, skb); ··· 1149 1148 mp->ttyskb = skb; 1150 1149 } else { 1151 1150 printk(KERN_ERR "capinc_put_char: char %u lost\n", ch); 1151 + ret = 0; 1152 1152 } 1153 1153 spin_unlock_irqrestore(&workaround_lock, flags); 1154 + return ret; 1154 1155 } 1155 1156 1156 1157 static void capinc_tty_flush_chars(struct tty_struct *tty)