From linux-kernel-owner+lkml=40e.kevb.net-S1759815AbYDMROO@vger.kernel.org Sun Apr 13 17:50:48 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 D5E6F1040D82 for ; Sun, 13 Apr 2008 17:50:47 -0400 (EDT) Received: from mail2.rollernet.us (localhost [127.0.0.1]) by mail2.rollernet.us (Postfix) with ESMTP id 53FE230538FC for ; Sun, 13 Apr 2008 10:14:18 -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:14:17 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759815AbYDMROO (ORCPT ); Sun, 13 Apr 2008 13:14:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756438AbYDMRN6 (ORCPT ); Sun, 13 Apr 2008 13:13:58 -0400 Received: from outpipe-village-512-1.bc.nu ([81.2.110.250]:46926 "EHLO lxorguk.ukuu.org.uk" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1754594AbYDMRN5 (ORCPT ); Sun, 13 Apr 2008 13:13:57 -0400 Received: from core (localhost.localdomain [127.0.0.1]) by lxorguk.ukuu.org.uk (8.14.2/8.14.2) with ESMTP id m3DH9vei015522; Sun, 13 Apr 2008 18:09:58 +0100 Date: Sun, 13 Apr 2008 18:09:57 +0100 From: Alan Cox To: akpm@osdl.org, linux-kernel@vger.kernel.org, linux-m68k@vger.kernel.org Subject: [PATCH] amiserial: Switch put char to return success/fail Message-ID: <20080413180957.1100a711@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 7581.48023f69.f2efc.0 Signed-off-by: Alan Cox diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc8-mm2/drivers/char/amiserial.c linux-2.6.25-rc8-mm2/drivers/char/amiserial.c --- linux.vanilla-2.6.25-rc8-mm2/drivers/char/amiserial.c 2008-04-13 15:36:53.000000000 +0100 +++ linux-2.6.25-rc8-mm2/drivers/char/amiserial.c 2008-04-13 15:50:20.000000000 +0100 @@ -832,33 +832,34 @@ local_irq_restore(flags); } -static void rs_put_char(struct tty_struct *tty, unsigned char ch) +static int rs_put_char(struct tty_struct *tty, unsigned char ch) { struct async_struct *info; unsigned long flags; if (!tty) - return; + return 0; info = tty->driver_data; if (serial_paranoia_check(info, tty->name, "rs_put_char")) - return; + return 0; if (!info->xmit.buf) - return; + return 0; local_irq_save(flags); if (CIRC_SPACE(info->xmit.head, info->xmit.tail, SERIAL_XMIT_SIZE) == 0) { local_irq_restore(flags); - return; + return 0; } info->xmit.buf[info->xmit.head++] = ch; info->xmit.head &= SERIAL_XMIT_SIZE-1; local_irq_restore(flags); + return 1; } static void rs_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/