serial: sh-sci: Fix could not remove dev_attr_rx_fifo_timeout

shimoday · gregkh · commit 641a41dbba21 · 2018-11-09T09:34:50.000-08:00
This patch fixes an issue that the sci_remove() could not remove dev_attr_rx_fifo_timeout because uart_remove_one_port() set the port->port.type to PORT_UNKNOWN. Reported-by: Hiromitsu Yamasaki <hiromitsu.yamasaki.ym@renesas.com> Fixes: 5d23188 ("serial: sh-sci: make RX FIFO parameters tunable via sysfs") Cc: <stable@vger.kernel.org> # v4.11+ Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> Reviewed-by: Ulrich Hecht <uli+renesas@fpond.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
@@ -3102,6 +3102,7 @@ static struct uart_driver sci_uart_driver = {
 static int sci_remove(struct platform_device *dev)
 {
 	struct sci_port *port = platform_get_drvdata(dev);
+	unsigned int type = port->port.type;	/* uart_remove_... clears it */
 
 	sci_ports_in_use &= ~BIT(port->port.line);
 	uart_remove_one_port(&sci_uart_driver, &port->port);
@@ -3112,8 +3113,7 @@ static int sci_remove(struct platform_device *dev)
 		sysfs_remove_file(&dev->dev.kobj,
 				  &dev_attr_rx_fifo_trigger.attr);
 	}
-	if (port->port.type == PORT_SCIFA || port->port.type == PORT_SCIFB ||
-	    port->port.type == PORT_HSCIF) {
+	if (type == PORT_SCIFA || type == PORT_SCIFB || type == PORT_HSCIF) {
 		sysfs_remove_file(&dev->dev.kobj,
 				  &dev_attr_rx_fifo_timeout.attr);
 	}

Original file line number	Diff line number	Diff line change
`@@ -3102,6 +3102,7 @@ static struct uart_driver sci_uart_driver = {`
`3102`	`3102`	`static int sci_remove(struct platform_device *dev)`
`3103`	`3103`	`{`
`3104`	`3104`	`struct sci_port *port = platform_get_drvdata(dev);`
	`3105`	`+ unsigned int type = port->port.type; /* uart_remove_... clears it */`
`3105`	`3106`
`3106`	`3107`	`sci_ports_in_use &= ~BIT(port->port.line);`
`3107`	`3108`	`uart_remove_one_port(&sci_uart_driver, &port->port);`
`@@ -3112,8 +3113,7 @@ static int sci_remove(struct platform_device *dev)`
`3112`	`3113`	`sysfs_remove_file(&dev->dev.kobj,`
`3113`	`3114`	`&dev_attr_rx_fifo_trigger.attr);`
`3114`	`3115`	`}`
`3115`		`- if (port->port.type == PORT_SCIFA \|\| port->port.type == PORT_SCIFB \|\|`
`3116`		`- port->port.type == PORT_HSCIF) {`
	`3116`	`+ if (type == PORT_SCIFA \|\| type == PORT_SCIFB \|\| type == PORT_HSCIF) {`
`3117`	`3117`	`sysfs_remove_file(&dev->dev.kobj,`
`3118`	`3118`	`&dev_attr_rx_fifo_timeout.attr);`
`3119`	`3119`	`}`