diff options
| author | Tejun Heo | 2018-12-28 03:05:30 +0100 |
|---|---|---|
| committer | Tejun Heo | 2018-12-28 03:05:30 +0100 |
| commit | 4d71c6f8771a6bccb844244f09831fa4624b22c1 (patch) | |
| tree | 9c6fdf753d64c839a4b0deb7d35d7e990c8e9971 /drivers/tty/serial/sh-sci.c | |
| parent | cpuset: Remove set but not used variable 'cs' (diff) | |
| parent | cgroup: fix CSS_TASK_ITER_PROCS (diff) | |
| download | kernel-qcow2-linux-4d71c6f8771a6bccb844244f09831fa4624b22c1.tar.gz kernel-qcow2-linux-4d71c6f8771a6bccb844244f09831fa4624b22c1.tar.xz kernel-qcow2-linux-4d71c6f8771a6bccb844244f09831fa4624b22c1.zip | |
Merge branch 'for-4.20-fixes' into for-4.21
Diffstat (limited to 'drivers/tty/serial/sh-sci.c')
| -rw-r--r-- | drivers/tty/serial/sh-sci.c | 8 |
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); } |