Re: [PATCH 1/1] Char: moxa, fix refcounting in moxa_poll_port

[Jan Yenya Kasprzak]

Jiri Slaby wrote:
: Repost, sorry, scripts don't understand Reported-by.

	Looks OK, and works for me (against 2.6.29-rc8).
Thanks for the fast response :-).

-Yenya

: Signed-off-by: Jiri Slaby <jirislaby@xxxxxxxxx>
: Reported-by: Jan 'Yenya' Kasprzak <kas@xxxxxxxxxx>
: Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>

Acked-by: Jan "Yenya" Kasprzak <kas@xxxxxxxxxx>

: ---
:  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
: 
: --
: To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
: the body of a message to majordomo@xxxxxxxxxxxxxxx
: More majordomo info at  http://vger.kernel.org/majordomo-info.html
: Please read the FAQ at  http://www.tux.org/lkml/

-- 
| Jan "Yenya" Kasprzak  <kas at {fi.muni.cz - work | yenya.net - private}> |
| GPG: ID 1024/D3498839      Fingerprint 0D99A7FB206605D7 8B35FCDE05B18A5E |
| http://www.fi.muni.cz/~kas/    Journal: http://www.fi.muni.cz/~kas/blog/ |
>>  If you find yourself arguing with Alan Cox, youâre _probably_ wrong.  <<
>>     --James Morris in "How and Why You Should Become a Kernel Hacker"  <<
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/