1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 2769a38d15b6..b386fc8a5eec 100644
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -446,6 +446,8 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
 
         /* Clear pending interrupts and mask all interrupts */
         if (s3c24xx_serial_has_interrupt_mask(port)) {
+                free_irq(port->irq, ourport);
+
                 wr_regl(port, S3C64XX_UINTP, 0xf);
                 wr_regl(port, S3C64XX_UINTM, 0xf);
         }
@@ -505,6 +507,8 @@ static int s3c64xx_serial_startup(struct uart_port *port)
         dbg("s3c64xx_serial_startup: port=%p (%08lx,%p)\n",
             port->mapbase, port->membase);
 
+        wr_regl(port, S3C64XX_UINTM, 0xf);
+
         ret = request_irq(port->irq, s3c64xx_serial_handle_irq, IRQF_SHARED,
                           s3c24xx_serial_portname(port), ourport);
         if (ret) {