diff options
| author | Greg KH <greg@press.(none)> | 2005-06-30 01:54:31 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-06-30 01:54:31 -0400 |
| commit | bf164c790deb79b18faf304b0763e44a02c79f90 (patch) | |
| tree | 8fedcdce1f65aa6bc98fea0da6227d3fc0fc51fd /drivers/serial/mpsc.c | |
| parent | d62c0f9fd2d3943a3eca85b490d86e1605000ccb (diff) | |
| parent | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/serial/mpsc.c')
| -rw-r--r-- | drivers/serial/mpsc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c index a2a643318002..e43276c6a954 100644 --- a/drivers/serial/mpsc.c +++ b/drivers/serial/mpsc.c | |||
| @@ -1058,12 +1058,9 @@ mpsc_get_mctrl(struct uart_port *port) | |||
| 1058 | { | 1058 | { |
| 1059 | struct mpsc_port_info *pi = (struct mpsc_port_info *)port; | 1059 | struct mpsc_port_info *pi = (struct mpsc_port_info *)port; |
| 1060 | u32 mflags, status; | 1060 | u32 mflags, status; |
| 1061 | ulong iflags; | ||
| 1062 | 1061 | ||
| 1063 | spin_lock_irqsave(&pi->port.lock, iflags); | ||
| 1064 | status = (pi->mirror_regs) ? pi->MPSC_CHR_10_m : | 1062 | status = (pi->mirror_regs) ? pi->MPSC_CHR_10_m : |
| 1065 | readl(pi->mpsc_base + MPSC_CHR_10); | 1063 | readl(pi->mpsc_base + MPSC_CHR_10); |
| 1066 | spin_unlock_irqrestore(&pi->port.lock, iflags); | ||
| 1067 | 1064 | ||
| 1068 | mflags = 0; | 1065 | mflags = 0; |
| 1069 | if (status & 0x1) | 1066 | if (status & 0x1) |