spin_unlock_irqrestore(&sport->port.lock, flags);
 }
 
-static void lpuart_timer_func(unsigned long data)
+static void lpuart_dma_rx_terminate(struct lpuart_port *sport)
 {
-       struct lpuart_port *sport = (struct lpuart_port *)data;
        struct tty_port *port = &sport->port.state->port;
        struct dma_tx_state state;
        unsigned long flags;
        spin_unlock_irqrestore(&sport->port.lock, flags);
 }
 
+static void lpuart_timer_func(unsigned long data)
+{
+       lpuart_dma_rx_terminate((struct lpuart_port *)data);
+}
+
 static inline void lpuart_prepare_rx(struct lpuart_port *sport)
 {
        unsigned long flags;
                writeb(temp, sport->port.membase + UARTCR2);
        }
 
+       if (sport->dma_rx_in_progress)
+               lpuart_dma_rx_terminate(sport);
+
        uart_suspend_port(&lpuart_reg, &sport->port);
+       if (sport->port.suspended && !sport->port.irq_wake)
+               clk_disable_unprepare(sport->clk);
 
        return 0;
 }
        struct lpuart_port *sport = dev_get_drvdata(dev);
        unsigned long temp;
 
+       if (sport->port.suspended && !sport->port.irq_wake)
+               clk_prepare_enable(sport->clk);
+
        if (sport->lpuart32) {
                lpuart32_setup_watermark(sport);
                temp = lpuart32_read(sport->port.membase + UARTCTRL);