Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tty: moxa, fix refcounting in moxa_poll_port

Browse source 
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 <jirislaby@gmail.com>
Reported-by: Jan 'Yenya' Kasprzak <kas@fi.muni.cz>
Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Slaby 2009-04-06 17:34:04 +01:00 committed by Linus Torvalds
parent bbb8e6bf10
commit 0e0fd7d73e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/char/moxa.c
View file

@ -1486,11 +1486,11 @@ static int moxa_poll_port(struct moxa_port *p, unsigned int handle,
} }
if (!handle) /* nothing else to do */ if (!handle) /* nothing else to do */
return 0; goto put;
intr = readw(ip); /* port irq status */ intr = readw(ip); /* port irq status */
if (intr == 0) if (intr == 0)
return 0; goto put;
writew(0, ip); /* ACK port */ writew(0, ip); /* ACK port */
ofsAddr = p->tableAddr; ofsAddr = p->tableAddr;
@ -1499,16 +1499,17 @@ static int moxa_poll_port(struct moxa_port *p, unsigned int handle,
ofsAddr + HostStat); ofsAddr + HostStat);
if (!inited) if (!inited)
return 0; goto put;
if (tty && (intr & IntrBreak) && !I_IGNBRK(tty)) { /* BREAK */ if (tty && (intr & IntrBreak) && !I_IGNBRK(tty)) { /* BREAK */
tty_insert_flip_char(tty, 0, TTY_BREAK); tty_insert_flip_char(tty, 0, TTY_BREAK);
tty_schedule_flip(tty); tty_schedule_flip(tty);
} }
tty_kref_put(tty);
if (intr & IntrLine) if (intr & IntrLine)
moxa_new_dcdstate(p, readb(ofsAddr + FlagStat) & DCD_state); moxa_new_dcdstate(p, readb(ofsAddr + FlagStat) & DCD_state);
put:
tty_kref_put(tty);
return 0; return 0;
} }