Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

Pull SuperH updates from Paul Mundt.

* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (25 commits)
  sh: Support I/O space swapping where needed.
  sh: use set_current_blocked() and block_sigmask()
  sh: no need to reset handler if SA_ONESHOT
  sh: intc: Fix up section mismatch for intc_ack_data
  sh: select ARCH_DISCARD_MEMBLOCK.
  sh: Consolidate duplicate _32/_64 unistd definitions.
  sh: ecovec: switch SDHI controllers to card polling
  sh: Avoid exporting unimplemented syscalls.
  sh: add platform_device for RSPI in setup-sh7757
  SH: pci-sh7780: enable big-endian operation.
  serial: sh-sci: fix a race of DMA submit_tx on transfer
  sh: dma: Collect up CHCR of SH7763, SH7764, SH7780 and SH7785
  sh: dma: Collect up CHCR of SH7723 and SH7730
  sh/next: Fix build fail by asm/system.h in asm/bitops.h
  arch/sh/drivers/dma/{dma-g2,dmabrg}.c: ensure arguments to request_irq and free_irq are compatible
  sh: cpufreq: Wire up scaling_available_freqs support.
  sh: cpufreq: notify about rate rounding fallback.
  sh: cpufreq: Support CPU clock frequency table.
  sh: cpufreq: struct device lookup from CPU topology.
  sh: cpufreq: percpu struct clk accounting.
  ...

1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
index f8db8a70c14e..bf461cf99616 100644
--- a/drivers/tty/serial/sh-sci.c
+++ b/drivers/tty/serial/sh-sci.c
@@ -1229,17 +1229,20 @@ static void sci_dma_tx_complete(void *arg)
         port->icount.tx += sg_dma_len(&s->sg_tx);
 
         async_tx_ack(s->desc_tx);
-        s->cookie_tx = -EINVAL;
         s->desc_tx = NULL;
 
         if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
                 uart_write_wakeup(port);
 
         if (!uart_circ_empty(xmit)) {
+                s->cookie_tx = 0;
                 schedule_work(&s->work_tx);
-        } else if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
-                u16 ctrl = sci_in(port, SCSCR);
-                sci_out(port, SCSCR, ctrl & ~SCSCR_TIE);
+        } else {
+                s->cookie_tx = -EINVAL;
+                if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
+                        u16 ctrl = sci_in(port, SCSCR);
+                        sci_out(port, SCSCR, ctrl & ~SCSCR_TIE);
+                }
         }
 
         spin_unlock_irqrestore(&port->lock, flags);
@@ -1501,8 +1504,10 @@ static void sci_start_tx(struct uart_port *port)
         }
 
         if (s->chan_tx && !uart_circ_empty(&s->port.state->xmit) &&
-            s->cookie_tx < 0)
+            s->cookie_tx < 0) {
+                s->cookie_tx = 0;
                 schedule_work(&s->work_tx);
+        }
 #endif
 
         if (!s->chan_tx || port->type == PORT_SCIFA || port->type == PORT_SCIFB) {