From linux-kernel-owner+lkml=40e.kevb.net-S1753532AbYDMR04@vger.kernel.org Sun Apr 13 16:05:49 2008 Return-Path: X-Original-To: lkml@e.kevb.net Delivered-To: lkml@e.kevb.net Received: from mail2.rollernet.us (mail2.rollernet.us [216.90.171.2]) by e.kevb.net (Postfix) with ESMTP id 2E8501040D3E for ; Sun, 13 Apr 2008 16:05:49 -0400 (EDT) Received: from mail2.rollernet.us (localhost [127.0.0.1]) by mail2.rollernet.us (Postfix) with ESMTP id 2CEC23052CB5 for ; Sun, 13 Apr 2008 10:27:07 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by mail2.rollernet.us (Postfix) with ESMTP for ; Sun, 13 Apr 2008 10:27:02 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753532AbYDMR04 (ORCPT ); Sun, 13 Apr 2008 13:26:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751563AbYDMR0r (ORCPT ); Sun, 13 Apr 2008 13:26:47 -0400 Received: from outpipe-village-512-1.bc.nu ([81.2.110.250]:54843 "EHLO lxorguk.ukuu.org.uk" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751423AbYDMR0q (ORCPT ); Sun, 13 Apr 2008 13:26:46 -0400 Received: from core (localhost.localdomain [127.0.0.1]) by lxorguk.ukuu.org.uk (8.14.2/8.14.2) with ESMTP id m3DHMITo015583; Sun, 13 Apr 2008 18:22:18 +0100 Date: Sun, 13 Apr 2008 18:22:17 +0100 From: Alan Cox To: linux-kernel@vger.kernel.org, akpm@osdl.org Subject: [PATCH] isdn: switch to int put_char method Message-ID: <20080413182217.1c3e1670@core> X-Mailer: Claws Mail 3.3.1 (GTK+ 2.12.5; x86_64-redhat-linux-gnu) Organization: Red Hat UK Cyf., Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, Y Deyrnas Gyfunol. Cofrestrwyd yng Nghymru a Lloegr o'r rhif cofrestru 3798903 Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Rollernet-Spf: tagging disabled X-Rollernet-Abuse: Processed by Roller Network Mail Services. See our abuse policy at http://rollernet.us/abuse.php X-Rollernet-Tracking: Tracking ID 1995.48024266.5b69.0 Signed-off-by: Alan Cox diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc8-mm2/drivers/isdn/capi/capi.c linux-2.6.25-rc8-mm2/drivers/isdn/capi/capi.c --- linux.vanilla-2.6.25-rc8-mm2/drivers/isdn/capi/capi.c 2008-04-13 15:36:53.000000000 +0100 +++ linux-2.6.25-rc8-mm2/drivers/isdn/capi/capi.c 2008-04-13 15:40:50.000000000 +0100 @@ -1111,11 +1111,12 @@ 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 sk_buff *skb; unsigned long flags; + int ret = 1; #ifdef _DEBUG_TTYFUNCS printk(KERN_DEBUG "capinc_put_char(%u)\n", ch); @@ -1125,7 +1126,7 @@ #ifdef _DEBUG_TTYFUNCS printk(KERN_DEBUG "capinc_tty_put_char: mp or mp->ncci NULL\n"); #endif - return; + return 0; } spin_lock_irqsave(&workaround_lock, flags); @@ -1134,7 +1135,7 @@ if (skb_tailroom(skb) > 0) { *(skb_put(skb, 1)) = ch; spin_unlock_irqrestore(&workaround_lock, flags); - return; + return 1; } mp->ttyskb = NULL; skb_queue_tail(&mp->outqueue, skb); @@ -1148,8 +1149,10 @@ mp->ttyskb = skb; } else { printk(KERN_ERR "capinc_put_char: char %u lost\n", ch); + ret = 0; } spin_unlock_irqrestore(&workaround_lock, flags); + return ret; } static void capinc_tty_flush_chars(struct tty_struct *tty) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/