summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-09-10 12:50:49 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-05 07:13:10 -0700
commitb0a382b5a35e306362cde912bff18a42cc00b0f5 (patch)
tree969f6c34714303f330752e1165e8d99a9f251470 /drivers/tty
parent64dc8de491ef490e979fe65d83daaadf32c83633 (diff)
downloadlinux-3.10-b0a382b5a35e306362cde912bff18a42cc00b0f5.tar.gz
linux-3.10-b0a382b5a35e306362cde912bff18a42cc00b0f5.tar.bz2
linux-3.10-b0a382b5a35e306362cde912bff18a42cc00b0f5.zip
serial: pch_uart: fix tty-kref leak in rx-error path
commit fc0919c68cb2f75bb1af759315f9d7e2a9443c28 upstream. Fix tty-kref leak introduced by commit 384e301e ("pch_uart: fix a deadlock when pch_uart as console") which never put its tty reference. Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/pch_uart.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 572d48189de..591cadb0bcc 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -1071,6 +1071,8 @@ static void pch_uart_err_ir(struct eg20t_port *priv, unsigned int lsr)
if (tty == NULL) {
for (i = 0; error_msg[i] != NULL; i++)
dev_err(&priv->pdev->dev, error_msg[i]);
+ } else {
+ tty_kref_put(tty);
}
}