iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

isdn: switch to int put_char method

Browse Source 
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>
This commit is contained in:
Alan Cox 2008-04-30 00:54:09 -07:00 committed by Linus Torvalds
parent 5d19f546e7
commit f2545a7563
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/isdn/capi/capi.c
View File

@ -1111,11 +1111,12 @@ static int capinc_tty_write(struct tty_struct * tty,
return count; return count;
} }
static void capinc_tty_put_char(struct tty_struct *tty, unsigned char ch) static int capinc_tty_put_char(struct tty_struct *tty, unsigned char ch)
{ {
struct capiminor *mp = (struct capiminor *)tty->driver_data; struct capiminor *mp = (struct capiminor *)tty->driver_data;
struct sk_buff *skb; struct sk_buff *skb;
unsigned long flags; unsigned long flags;
int ret = 1;
#ifdef _DEBUG_TTYFUNCS #ifdef _DEBUG_TTYFUNCS
printk(KERN_DEBUG "capinc_put_char(%u)\n", ch); printk(KERN_DEBUG "capinc_put_char(%u)\n", ch);
@ -1125,7 +1126,7 @@ static void capinc_tty_put_char(struct tty_struct *tty, unsigned char ch)
#ifdef _DEBUG_TTYFUNCS #ifdef _DEBUG_TTYFUNCS
printk(KERN_DEBUG "capinc_tty_put_char: mp or mp->ncci NULL\n"); printk(KERN_DEBUG "capinc_tty_put_char: mp or mp->ncci NULL\n");
#endif #endif
return; return 0;
} }
spin_lock_irqsave(&workaround_lock, flags); spin_lock_irqsave(&workaround_lock, flags);
@ -1134,7 +1135,7 @@ static void capinc_tty_put_char(struct tty_struct *tty, unsigned char ch)
if (skb_tailroom(skb) > 0) { if (skb_tailroom(skb) > 0) {
*(skb_put(skb, 1)) = ch; *(skb_put(skb, 1)) = ch;
spin_unlock_irqrestore(&workaround_lock, flags); spin_unlock_irqrestore(&workaround_lock, flags);
return; return 1;
} }
mp->ttyskb = NULL; mp->ttyskb = NULL;
skb_queue_tail(&mp->outqueue, skb); skb_queue_tail(&mp->outqueue, skb);
@ -1148,8 +1149,10 @@ static void capinc_tty_put_char(struct tty_struct *tty, unsigned char ch)
mp->ttyskb = skb; mp->ttyskb = skb;
} else { } else {
printk(KERN_ERR "capinc_put_char: char %u lost\n", ch); printk(KERN_ERR "capinc_put_char: char %u lost\n", ch);
ret = 0;
} }
spin_unlock_irqrestore(&workaround_lock, flags); spin_unlock_irqrestore(&workaround_lock, flags);
return ret;
} }
static void capinc_tty_flush_chars(struct tty_struct *tty) static void capinc_tty_flush_chars(struct tty_struct *tty)