6 files changed, 12 insertions, 7 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index ce948b66bbd4..27f34a9f9cb7 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1874,7 +1874,9 @@ static int serial8250_startup(struct uart_port *port)
                  * the interrupt is enabled.  Delays are necessary to
                  * allow register changes to become visible.
                  */
-                spin_lock_irqsave(&up->port.lock, flags);
+                spin_lock(&up->port.lock);
+                if (up->port.flags & UPF_SHARE_IRQ)
+                        disable_irq_nosync(up->port.irq);
 
                 wait_for_xmitr(up, UART_LSR_THRE);
                 serial_out_sync(up, UART_IER, UART_IER_THRI);
@@ -1886,7 +1888,9 @@ static int serial8250_startup(struct uart_port *port)
                 iir = serial_in(up, UART_IIR);
                 serial_out(up, UART_IER, 0);
 
-                spin_unlock_irqrestore(&up->port.lock, flags);
+                if (up->port.flags & UPF_SHARE_IRQ)
+                        enable_irq(up->port.irq);
+                spin_unlock(&up->port.lock);
 
                 /*
                  * If the interrupt is not reasserted, setup a timer to
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index abe129cc927a..93e407ee08b9 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -209,7 +209,7 @@ static void cpm_uart_int_rx(struct uart_port *port)
         int i;
         unsigned char ch;
         u8 *cp;
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         struct uart_cpm_port *pinfo = (struct uart_cpm_port *)port;
         cbd_t __iomem *bdp;
         u16 status;
diff --git a/drivers/serial/icom.c b/drivers/serial/icom.c
index 9c2df5c857cf..2b7531d9f6ab 100644
--- a/drivers/serial/icom.c
+++ b/drivers/serial/icom.c
@@ -730,7 +730,7 @@ static void xmit_interrupt(u16 port_int_reg, struct icom_port *icom_port)
 static void recv_interrupt(u16 port_int_reg, struct icom_port *icom_port)
 {
         short int count, rcv_buff;
-        struct tty_struct *tty = icom_port->uart_port.info->tty;
+        struct tty_struct *tty = icom_port->uart_port.info->port.tty;
         unsigned short int status;
         struct uart_icount *icount;
         unsigned long offset;
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
index 4a3ecaa629e6..d852f83f8900 100644
--- a/drivers/serial/samsung.c
+++ b/drivers/serial/samsung.c
@@ -202,7 +202,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
 {
         struct s3c24xx_uart_port *ourport = dev_id;
         struct uart_port *port = &ourport->port;
-        struct tty_struct *tty = port->info->tty;
+        struct tty_struct *tty = port->info->port.tty;
         unsigned int ufcon, ch, flag, ufstat, uerstat;
         int max_count = 64;
 
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 0bce1fe2c62a..f977c98cfa95 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -934,7 +934,7 @@ uart_tiocmset(struct tty_struct *tty, struct file *file,
         return ret;
 }
 
-static void uart_break_ctl(struct tty_struct *tty, int break_state)
+static int uart_break_ctl(struct tty_struct *tty, int break_state)
 {
         struct uart_state *state = tty->driver_data;
         struct uart_port *port = state->port;
@@ -945,6 +945,7 @@ static void uart_break_ctl(struct tty_struct *tty, int break_state)
                 port->ops->break_ctl(port, break_state);
 
         mutex_unlock(&state->mutex);
+        return 0;
 }
 
 static int uart_do_autoconfig(struct uart_state *state)
diff --git a/drivers/serial/serial_txx9.c b/drivers/serial/serial_txx9.c
index 7ad21925869a..8fcb4c5b9a26 100644
--- a/drivers/serial/serial_txx9.c
+++ b/drivers/serial/serial_txx9.c
@@ -272,7 +272,7 @@ static void serial_txx9_initialize(struct uart_port *port)
 static inline void
 receive_chars(struct uart_txx9_port *up, unsigned int *status)
 {
-        struct tty_struct *tty = up->port.info->tty;
+        struct tty_struct *tty = up->port.info->port.tty;
         unsigned char ch;
         unsigned int disr = *status;
         int max_count = 256;