diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-05-26 15:48:30 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-05-26 15:48:39 +0400 |
| commit | 1102c660dd35725a11c7ca9365c237f2f42f6b30 (patch) | |
| tree | cd32d3053b30050182218e0d36b4aed7459c48de /drivers/tty/cyclades.c | |
| parent | 6e9101aeec39961308176e0f59e73ac5d37d243a (diff) | |
| parent | 4db70f73e56961b9bcdfd0c36c62847a18b7dbb5 (diff) | |
| download | linux-1102c660dd35725a11c7ca9365c237f2f42f6b30.tar.xz | |
Merge branch 'linus' into perf/urgent
Merge reason: Linus applied an overlapping commit:
5f2e8e2b0bf0: kernel/watchdog.c: Use proper ANSI C prototypes
So merge it in to make sure we can iterate the file without conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/tty/cyclades.c')
| -rw-r--r-- | drivers/tty/cyclades.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c index c99728f0cd9f..bfa05e801823 100644 --- a/drivers/tty/cyclades.c +++ b/drivers/tty/cyclades.c @@ -3,8 +3,6 @@ #undef Z_EXT_CHARS_IN_BUFFER /* - * linux/drivers/char/cyclades.c - * * This file contains the driver for the Cyclades async multiport * serial boards. * @@ -1445,13 +1443,11 @@ static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty) { struct cyclades_card *card; unsigned long flags; - int channel; if (!(info->port.flags & ASYNC_INITIALIZED)) return; card = info->card; - channel = info->line - card->first_line; if (!cy_is_Z(card)) { spin_lock_irqsave(&card->card_lock, flags); @@ -1476,6 +1472,7 @@ static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty) spin_unlock_irqrestore(&card->card_lock, flags); } else { #ifdef CY_DEBUG_OPEN + int channel = info->line - card->first_line; printk(KERN_DEBUG "cyc shutdown Z card %d, channel %d, " "base_addr %p\n", card, channel, card->base_addr); #endif |