1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index ff6ba6d86cd8..cc56cb3b3eca 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1614,10 +1614,10 @@ static void sci_request_dma(struct uart_port *port)
                 hrtimer_init(&s->rx_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
                 s->rx_timer.function = rx_timer_fn;
 
+                s->chan_rx_saved = s->chan_rx = chan;
+
                 if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
                         sci_submit_rx(s);
-
-                s->chan_rx_saved = s->chan_rx = chan;
         }
 }
 
@@ -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);
         }