Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 71167
b: refs/heads/master
c: 0678c5b
h: refs/heads/master
i:
  71165: 6c2787d
  71163: bd2103c
  71159: 3f6d1a1
  71151: fffb552
  71135: 080c9a0
  71103: 6166835
  71039: 0581a9e
  70911: 47c2e5f
  70655: 8cebdcc
v: v3
  • Loading branch information
Alan Cox authored and Linus Torvalds committed Oct 18, 2007
1 parent aeed69c commit f069433
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 009ae1dbd57569418ab4f7ae7c8864efa3ac7e4a
refs/heads/master: 0678c5b679db7abe8b8d658127e0fed4ceece41c
19 changes: 0 additions & 19 deletions trunk/drivers/char/mxser.c
Original file line number Diff line number Diff line change
Expand Up @@ -1938,14 +1938,6 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id)
inb(info->base + UART_MSR);
continue;
}
/* above add by Victor Yu. 09-13-2002 */
/*
if (info->tty->flip.count < TTY_FLIPBUF_SIZE / 4) {
info->IER |= MOXA_MUST_RECV_ISR;
outb(info->IER, info->base + UART_IER);
}
*/


/* mask by Victor Yu. 09-13-2002
if ( !info->tty ||
Expand Down Expand Up @@ -2599,19 +2591,8 @@ static int mxser_change_speed(struct mxser_struct *info, struct ktermios *old_te
info->IER |= UART_IER_MSI;
if ((info->type == PORT_16550A) || (info->IsMoxaMustChipFlag)) {
info->MCR |= UART_MCR_AFE;
/* status = mxser_get_msr(info->base, 0, info->port); */
/*
save_flags(flags);
cli();
status = inb(baseaddr + UART_MSR);
restore_flags(flags);
*/
/* mxser_check_modem_status(info, status); */
} else {
/* status = mxser_get_msr(info->base, 0, info->port); */
/* MX_LOCK(&info->slock); */
status = inb(info->base + UART_MSR);
/* MX_UNLOCK(&info->slock); */
if (info->tty->hw_stopped) {
if (status & UART_MSR_CTS) {
info->tty->hw_stopped = 0;
Expand Down

0 comments on commit f069433

Please sign in to comment.