diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 14:08:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 14:08:57 -0400 |
| commit | 428929a234d2c4b8a6d0145d0dcf687fcfa27325 (patch) | |
| tree | dd097eeabbd41c4713be5ea7663f52399183fd84 /drivers | |
| parent | 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 (diff) | |
| parent | 8c1addbc752660e95bbf2128d66b8e5bb38d5fc7 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Fix breakage from irq change
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/sn_console.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/sn_console.c b/drivers/serial/sn_console.c index 709f93a6c18c..956b2cf08e1e 100644 --- a/drivers/serial/sn_console.c +++ b/drivers/serial/sn_console.c | |||
| @@ -674,7 +674,7 @@ static void sn_sal_timer_poll(unsigned long data) | |||
| 674 | if (!port->sc_port.irq) { | 674 | if (!port->sc_port.irq) { |
| 675 | spin_lock_irqsave(&port->sc_port.lock, flags); | 675 | spin_lock_irqsave(&port->sc_port.lock, flags); |
| 676 | if (sn_process_input) | 676 | if (sn_process_input) |
| 677 | sn_receive_chars(port, NULL, flags); | 677 | sn_receive_chars(port, flags); |
| 678 | sn_transmit_chars(port, TRANSMIT_RAW); | 678 | sn_transmit_chars(port, TRANSMIT_RAW); |
| 679 | spin_unlock_irqrestore(&port->sc_port.lock, flags); | 679 | spin_unlock_irqrestore(&port->sc_port.lock, flags); |
| 680 | mod_timer(&port->sc_timer, | 680 | mod_timer(&port->sc_timer, |