From patchwork Sun Aug 2 00:36:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tilman Schmidt X-Patchwork-Id: 30460 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 36E5DB7088 for ; Sun, 2 Aug 2009 10:37:42 +1000 (EST) Received: by ozlabs.org (Postfix) id 25F63DDDE5; Sun, 2 Aug 2009 10:37:42 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 9EBC9DDDD3 for ; Sun, 2 Aug 2009 10:37:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751436AbZHBAg5 (ORCPT ); Sat, 1 Aug 2009 20:36:57 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751215AbZHBAg4 (ORCPT ); Sat, 1 Aug 2009 20:36:56 -0400 Received: from mail.pxnet.com ([195.227.45.7]:54379 "EHLO mail.pxnet.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750857AbZHBAg4 (ORCPT ); Sat, 1 Aug 2009 20:36:56 -0400 Received: from xenon.ts.pxnet.com ([10.8.0.10]) (user=ts author=<> mech=DIGEST-MD5 bits=0) by mail.pxnet.com (8.13.8/8.13.8) with ESMTP id n720ais4000319; Sun, 2 Aug 2009 02:36:46 +0200 Received: by xenon.ts.pxnet.com (Postfix, from userid 1000) id 3589C111853; Sun, 2 Aug 2009 02:36:43 +0200 (CEST) From: Tilman Schmidt Subject: [PATCH v2 2.6.31-rc4] gigaset: really fix chars_in_buffer To: davem@davemloft.net, linux-kernel@vger.kernel.org, netdev@vger.kernel.org CC: Alan Cox , Hansjoerg Lipp Message-ID: <20090802-patch-01.tilman@imap.cc> In-Reply-To: <20090801-patch-01.tilman@imap.cc> References: <20090801-patch-01.tilman@imap.cc> Date: Sun, 2 Aug 2009 02:36:43 +0200 (CEST) X-Spam-Score: 0.1 () AWL,RDNS_NONE X-Scanned-By: MIMEDefang 2.67 on 195.227.45.7 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The tty_operation chars_in_buffer() is not allowed to return a negative value to signal an error. Corrects the problem flagged by commit 23198fda7182969b619613a555f8645fdc3dc334, "tty: fix chars_in_buffers". Impact: error handling bugfix Signed-off-by: Tilman Schmidt --- drivers/isdn/gigaset/interface.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c index 8ff7e35..f33ac27 100644 --- a/drivers/isdn/gigaset/interface.c +++ b/drivers/isdn/gigaset/interface.c @@ -408,33 +408,28 @@ static int if_write_room(struct tty_struct *tty) return retval; } -/* FIXME: This function does not have error returns */ - static int if_chars_in_buffer(struct tty_struct *tty) { struct cardstate *cs; - int retval = -ENODEV; + int retval = 0; cs = (struct cardstate *) tty->driver_data; if (!cs) { pr_err("%s: no cardstate\n", __func__); - return -ENODEV; + return 0; } gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__); - if (mutex_lock_interruptible(&cs->mutex)) - return -ERESTARTSYS; // FIXME -EINTR? + mutex_lock(&cs->mutex); - if (!cs->connected) { + if (!cs->connected) gig_dbg(DEBUG_IF, "not connected"); - retval = -ENODEV; - } else if (!cs->open_count) + else if (!cs->open_count) dev_warn(cs->dev, "%s: device not opened\n", __func__); - else if (cs->mstate != MS_LOCKED) { + else if (cs->mstate != MS_LOCKED) dev_warn(cs->dev, "can't write to unlocked device\n"); - retval = -EBUSY; - } else + else retval = cs->ops->chars_in_buffer(cs); mutex_unlock(&cs->mutex);