Skip to contentSkip to conversation

Patch "serial: 8250_uniphier: fix error return code in uniphier_uart_probe()" has been added to the 4.14-stable tree

PATCH [email protected] 1 participant 1 message Feb 2, 2018

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

serial: 8250_uniphier: fix error return code in uniphier_uart_probe()

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
serial-8250_uniphier-fix-error-return-code-in-uniphier_uart_probe.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 7defa77d2baca4d6eb85234f10f38ab618332e75 Mon Sep 17 00:00:00 2001

From: Wei Yongjun <[email protected]>
Date: Thu, 4 Jan 2018 07:42:15 +0000
Subject: serial: 8250_uniphier: fix error return code in uniphier_uart_probe()

From: Wei Yongjun <[email protected]>

commit 7defa77d2baca4d6eb85234f10f38ab618332e75 upstream.

Fix to return a negative error code from the port register error handling case instead of 0, as done elsewhere in this function.

Fixes 39be40ce066d ("serial: 8250_uniphier: fix serial port index in private data")
---
 drivers/tty/serial/8250/8250_uniphier.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/tty/serial/8250/8250_uniphier.c +3 -2
@@ -259,12 +259,13 @@ static int uniphier_uart_probe(struct pl
 	up.dl_read = uniphier_serial_dl_read;
 	up.dl_write = uniphier_serial_dl_write;
 
-	priv->line = serial8250_register_8250_port(&up);
-	if (priv->line < 0) {
+	ret = serial8250_register_8250_port(&up);
+	if (ret < 0) {
 		dev_err(dev, "failed to register 8250 port\n");
 		clk_disable_unprepare(priv->clk);
 		return ret;
 	}
+	priv->line = ret;
 
 	platform_set_drvdata(pdev, priv);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/test_firmware-fix-missing-unlock-on-error-in-config_num_requests_store.patch queue-4.14/serial-8250_uniphier-fix-error-return-code-in-uniphier_uart_probe.patch