---

yaml --- r: 248647 b: refs/heads/master c: 0e7f419 h: refs/heads/master i: 248645: f95db1b 248643: d38c340 248639: 97c2811 v: v3
git-mirror · Apr 19, 2011 · 79f33cc · 79f33cc
1 parent 64ddac9
commit 79f33cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4fd53ef5c97ef7ce909c18bf7fb8b5cdd72b08c1
+refs/heads/master: 0e7f4194a0ef70c1d0d40152fa480a63719f35d5
diff --git a/trunk/drivers/tty/cyclades.c b/trunk/drivers/tty/cyclades.c
@@ -1445,13 +1445,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 +1474,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