Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756498Ab0KXX2L (ORCPT ); Wed, 24 Nov 2010 18:28:11 -0500 Received: from mail.pripojeni.net ([217.66.174.14]:57418 "EHLO smtp.pripojeni.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751367Ab0KXX2G (ORCPT ); Wed, 24 Nov 2010 18:28:06 -0500 From: Jiri Slaby To: gregkh@suse.de Cc: slapin@ossfans.org, linux-kernel@vger.kernel.org, jirislaby@gmail.com, Alan Cox , Andrew Hendry , linux-x25@vger.kernel.org Subject: [PATCH 2/2] NET: wan/x25, fix ldisc->open retval Date: Thu, 25 Nov 2010 00:27:55 +0100 Message-Id: <1290641275-21726-2-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <4CED9498.9080900@suse.cz> References: <4CED9498.9080900@suse.cz> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1092 Lines: 37 We should never return positive values from ldisc->open, tty layer doesn't (and never did) expect that. If we do that, weird things like warnings in tty_ldisc_close happen. Not sure if dev->base_addr is used somehow now. Signed-off-by: Jiri Slaby Cc: Alan Cox Cc: Andrew Hendry Cc: linux-x25@vger.kernel.org --- drivers/net/wan/x25_asy.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index d81ad83..66cda25 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c @@ -582,7 +582,7 @@ static int x25_asy_open_tty(struct tty_struct *tty) if (err) return err; /* Done. We have linked the TTY line to a channel. */ - return sl->dev->base_addr; + return 0; } -- 1.7.3.1 -- 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/