From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757084AbZCOJhT (ORCPT ); Sun, 15 Mar 2009 05:37:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754048AbZCOJhF (ORCPT ); Sun, 15 Mar 2009 05:37:05 -0400 Received: from smtp.wellnetcz.com ([212.24.148.102]:50063 "EHLO smtp.wellnetcz.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753562AbZCOJhE (ORCPT ); Sun, 15 Mar 2009 05:37:04 -0400 From: Jiri Slaby To: Andrew Morton Cc: linux-kernel@vger.kernel.org, Jiri Slaby , Alan Cox Subject: [PATCH 1/1] Char: moxa, fix refcounting in moxa_poll_port Date: Sun, 15 Mar 2009 10:36:08 +0100 Message-Id: <1237109768-3820-1-git-send-email-jirislaby@gmail.com> X-Mailer: git-send-email 1.6.2 In-Reply-To: <49BCCAE0.6010303@gmail.com> References: <49BCCAE0.6010303@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There is missing tty_kref_put on some paths in moxa_poll_port, although the reference is always taken. Fix it. Signed-off-by: Jiri Slaby Reported-by: Jan 'Yenya' Kasprzak Cc: Alan Cox --- drivers/char/moxa.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 8b0da97..4a4cab7 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c @@ -1486,11 +1486,11 @@ static int moxa_poll_port(struct moxa_port *p, unsigned int handle, } if (!handle) /* nothing else to do */ - return 0; + goto put; intr = readw(ip); /* port irq status */ if (intr == 0) - return 0; + goto put; writew(0, ip); /* ACK port */ ofsAddr = p->tableAddr; @@ -1499,16 +1499,17 @@ static int moxa_poll_port(struct moxa_port *p, unsigned int handle, ofsAddr + HostStat); if (!inited) - return 0; + goto put; if (tty && (intr & IntrBreak) && !I_IGNBRK(tty)) { /* BREAK */ tty_insert_flip_char(tty, 0, TTY_BREAK); tty_schedule_flip(tty); } - tty_kref_put(tty); if (intr & IntrLine) moxa_new_dcdstate(p, readb(ofsAddr + FlagStat) & DCD_state); +put: + tty_kref_put(tty); return 0; } -- 1.6.2