---

yaml --- r: 43657 b: refs/heads/master c: eba529e h: refs/heads/master i: 43655: f9a0b9b v: v3
git-mirror · Dec 8, 2006 · 86718e1 · 86718e1
1 parent 6c7387d
commit 86718e1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06cc86b5bd4edcf5e7d68624f7d5c9951916f3d1
+refs/heads/master: eba529ecf76fcea5f82ceaf803b030d5e0ce71f7
diff --git a/trunk/drivers/char/mxser_new.c b/trunk/drivers/char/mxser_new.c
@@ -1687,22 +1687,12 @@ static void mxser_startrx(struct tty_struct *tty)
  */
 static void mxser_throttle(struct tty_struct *tty)
 {
-	struct mxser_port *info = tty->driver_data;
-	unsigned long flags;
-
-	spin_lock_irqsave(&info->slock, flags);
 	mxser_stoprx(tty);
-	spin_unlock_irqrestore(&info->slock, flags);
 }
 
 static void mxser_unthrottle(struct tty_struct *tty)
 {
-	struct mxser_port *info = tty->driver_data;
-	unsigned long flags;
-
-	spin_lock_irqsave(&info->slock, flags);
 	mxser_startrx(tty);
-	spin_unlock_irqrestore(&info->slock, flags);
 }
 
 static void mxser_set_termios(struct tty_struct *tty, struct termios *old_termios)
@@ -1930,7 +1920,6 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 				}
 				/* above add by Victor Yu. 09-13-2002 */
 
-				spin_lock(&port->slock);
 				/* following add by Victor Yu. 09-02-2002 */
 				status = inb(port->ioaddr + UART_LSR);
 
@@ -1981,7 +1970,6 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 					if (status & UART_LSR_THRE)
 						mxser_transmit_chars(port);
 				}
-				spin_unlock(&port->slock);
 			} while (int_cnt++ < MXSER_ISR_PASS_LIMIT);
 		}
 		if (pass_counter++ > MXSER_ISR_PASS_LIMIT)