3 files changed, 12 insertions, 7 deletions

diff --git a/drivers/serial/8250_early.c b/drivers/serial/8250_early.c
index 4d4c9f01be8d..1f16de719962 100644
--- a/drivers/serial/8250_early.c
+++ b/drivers/serial/8250_early.c
@@ -76,7 +76,7 @@ static void __init wait_for_xmitr(struct uart_port *port)
         }
 }
 
-static void __init putc(struct uart_port *port, int c)
+static void __init serial_putc(struct uart_port *port, int c)
 {
         wait_for_xmitr(port);
         serial_out(port, UART_TX, c);
@@ -91,7 +91,7 @@ static void __init early_serial8250_write(struct console *console, const char *s
         ier = serial_in(port, UART_IER);
         serial_out(port, UART_IER, 0);
 
-        uart_console_write(port, s, count, putc);
+        uart_console_write(port, s, count, serial_putc);
 
         /* Wait for transmitter to become empty and restore the IER */
         wait_for_xmitr(port);
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c
index 0e357562ce9e..ceb03c9e749f 100644
--- a/drivers/serial/8250_pci.c
+++ b/drivers/serial/8250_pci.c
@@ -1986,6 +1986,7 @@ static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state)
 
 static int pciserial_resume_one(struct pci_dev *dev)
 {
+        int err;
         struct serial_private *priv = pci_get_drvdata(dev);
 
         pci_set_power_state(dev, PCI_D0);
@@ -1995,7 +1996,9 @@ static int pciserial_resume_one(struct pci_dev *dev)
                 /*
                  * The device may have been disabled.  Re-enable it.
                  */
-                pci_enable_device(dev);
+                err = pci_enable_device(dev);
+                if (err)
+                        return err;
 
                 pciserial_resume_ports(priv);
         }
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index dfef83f14960..a85f2d31a686 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -329,12 +329,14 @@ static struct uart_ops ulite_ops = {
 static void ulite_console_wait_tx(struct uart_port *port)
 {
         int i;
+        u8 val;
 
-        /* wait up to 10ms for the character(s) to be sent */
-        for (i = 0; i < 10000; i++) {
-                if (readb(port->membase + ULITE_STATUS) & ULITE_STATUS_TXEMPTY)
+        /* Spin waiting for TX fifo to have space available */
+        for (i = 0; i < 100000; i++) {
+                val = readb(port->membase + ULITE_STATUS);
+                if ((val & ULITE_STATUS_TXFULL) == 0)
                         break;
-                udelay(1);
+                cpu_relax();
         }
 }