Merge branch 'fixes' into tty-next

This was a "forgotten" branch of tty fixes that somehow didn't make it
into my "main" branches, my fault.

Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --combined drivers/tty/serial/pch_uart.c
index 9cbd3acaf37fca13a55ea6b9a854e259790d1758,6bb7e90c8f22bc7a6d8e717a414dbd4130dfb97e..8fa1134e005165dc2ca33ef43b9d575368602590
--- 1/drivers/tty/serial/pch_uart.c
--- 2/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@@ -1508,10 -1508,14 +1508,14 @@@ static int pch_uart_verify_port(struct 
                        __func__);
                return -EOPNOTSUPP;
  #endif
-               dev_info(priv->port.dev, "PCH UART : Use DMA Mode\n");
-               if (!priv->use_dma)
+               if (!priv->use_dma) {
                        pch_request_dma(port);
-               priv->use_dma = 1;
+                       if (priv->chan_rx)
+                               priv->use_dma = 1;
+               }
+               dev_info(priv->port.dev, "PCH UART: %s\n",
+                               priv->use_dma ?
+                               "Use DMA Mode" : "No DMA");
        }
  
        return 0;
@@@ -1853,6 -1857,7 +1857,6 @@@ static void pch_uart_exit_port(struct e
                debugfs_remove(priv->debugfs);
  #endif
        uart_remove_one_port(&pch_uart_driver, &priv->port);
 -      pci_set_drvdata(priv->pdev, NULL);
        free_page((unsigned long)priv->rxbuf.buf);
  }
  
@@@ -1906,7 -1911,7 +1910,7 @@@ static int pch_uart_pci_resume(struct p
  #define pch_uart_pci_resume NULL
  #endif
  
 -static DEFINE_PCI_DEVICE_TABLE(pch_uart_pci_id) = {
 +static const struct pci_device_id pch_uart_pci_id[] = {
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8811),
         .driver_data = pch_et20t_uart0},
        {PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x8812),