aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-09-10 12:50:49 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-11 12:04:21 -0700
commitf84f26e72c1286582da55dd76752ef4296faeccd (patch)
treef32ffc33b621ff55e34d2c179ab0dfe5208be2e7
parent3f88e029fd9a5e45a26614f4d8fe0d30c09c180c (diff)
downloadlinux-linaro-stable-f84f26e72c1286582da55dd76752ef4296faeccd.tar.gz
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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Cc: Rui Xiang <rui.xiang@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 5a3fa3a31370..e78d2a6b4083 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -1065,6 +1065,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);
}
}