Commit 0e0fd7d7 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds

tty: moxa, fix refcounting in moxa_poll_port

There is missing tty_kref_put on some paths in moxa_poll_port,
although the reference is always taken. Fix it.
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Reported-by: default avatarJan 'Yenya' Kasprzak <kas@fi.muni.cz>
Signed-off-by: default avatarAlan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bbb8e6bf
...@@ -1486,11 +1486,11 @@ static int moxa_poll_port(struct moxa_port *p, unsigned int handle, ...@@ -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, ...@@ -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;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment