diff --git a/[refs] b/[refs] index 92afde0ef801..6643bcc02dd4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c590f3ca99c193a04fe90ec89046138b66fcc1e +refs/heads/master: c976cc3aa99e813084fc4bd295c9f7b706738b48 diff --git a/trunk/drivers/staging/generic_serial/generic_serial.c b/trunk/drivers/staging/generic_serial/generic_serial.c index 5954ee1dc953..466988dbc37d 100644 --- a/trunk/drivers/staging/generic_serial/generic_serial.c +++ b/trunk/drivers/staging/generic_serial/generic_serial.c @@ -566,9 +566,9 @@ void gs_close(struct tty_struct * tty, struct file * filp) * line status register. */ - spin_lock_irqsave(&port->driver_lock, flags); + spin_lock(&port->driver_lock); port->rd->disable_rx_interrupts (port); - spin_unlock_irqrestore(&port->driver_lock, flags); + spin_unlock(&port->driver_lock); spin_unlock_irqrestore(&port->port.lock, flags); /* close has no way of returning "EINTR", so discard return value */