|
@@ -3102,6 +3102,7 @@ static struct uart_driver sci_uart_driver = {
|
|
static int sci_remove(struct platform_device *dev)
|
|
static int sci_remove(struct platform_device *dev)
|
|
{
|
|
{
|
|
struct sci_port *port = platform_get_drvdata(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);
|
|
sci_ports_in_use &= ~BIT(port->port.line);
|
|
uart_remove_one_port(&sci_uart_driver, &port->port);
|
|
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,
|
|
sysfs_remove_file(&dev->dev.kobj,
|
|
&dev_attr_rx_fifo_trigger.attr);
|
|
&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,
|
|
sysfs_remove_file(&dev->dev.kobj,
|
|
&dev_attr_rx_fifo_timeout.attr);
|
|
&dev_attr_rx_fifo_timeout.attr);
|
|
}
|
|
}
|