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 <gregkh@linuxfoundation.org>

3 files changed, 16 insertions, 6 deletions

diff --git a/drivers/tty/serial/icom.c b/drivers/tty/serial/icom.c
index d98e43348970..67423805e6d9 100644
--- a/drivers/tty/serial/icom.c
+++ b/drivers/tty/serial/icom.c
@@ -455,11 +455,11 @@ static void load_code(struct icom_port *icom_port)
         for (index = 0; index < fw->size; index++)
                 new_page[index] = fw->data[index];
 
-        release_firmware(fw);
-
         writeb((char) ((fw->size + 16)/16), &icom_port->dram->mac_length);
         writel(temp_pci, &icom_port->dram->mac_load_addr);
 
+        release_firmware(fw);
+
         /*Setting the syncReg to 0x80 causes adapter to start downloading
            the personality code into adapter instruction RAM.
            Once code is loaded, it will begin executing and, based on
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c
index 9cbd3acaf37f..8fa1134e0051 100644
--- a/drivers/tty/serial/pch_uart.c
+++ b/drivers/tty/serial/pch_uart.c
@@ -1508,10 +1508,14 @@ static int pch_uart_verify_port(struct uart_port *port,
                         __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;
diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index c1af04d46682..9cd706df3b33 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1209,7 +1209,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
 
         /* reset the fifos (and setup the uart) */
         s3c24xx_serial_resetport(port, cfg);
-        clk_disable_unprepare(ourport->clk);
         return 0;
 }
 
@@ -1287,6 +1286,13 @@ static int s3c24xx_serial_probe(struct platform_device *pdev)
         uart_add_one_port(&s3c24xx_uart_drv, &ourport->port);
         platform_set_drvdata(pdev, &ourport->port);
 
+        /*
+         * Deactivate the clock enabled in s3c24xx_serial_init_port here,
+         * so that a potential re-enablement through the pm-callback overlaps
+         * and keeps the clock enabled in this case.
+         */
+        clk_disable_unprepare(ourport->clk);
+
 #ifdef CONFIG_SAMSUNG_CLOCK
         ret = device_create_file(&pdev->dev, &dev_attr_clock_source);
         if (ret < 0)