From ab9f122acdbea4308f4294434b897d84bcaf82a9 Mon Sep 17 00:00:00 2001
From: Eric Sesterhenn <snakebyte@gmx.de>
Date: Sun, 26 Mar 2006 18:17:21 +0200
Subject: [PATCH] --- yaml --- r: 24203 b: refs/heads/master c:
 56ee48277fa214b3b7b0fd91e7fd3464e12597de h: refs/heads/master i:   24201:
 8f2ab930f57b0f9a82d7567a46e86ddaf5728a2a   24199:
 dbfc070e641d19eaac8851e1ac859ccd954ef426 v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/char/epca.c   |  3 +--
 trunk/drivers/char/tty_io.c | 11 ++++-------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 8cf2dd119a19..d774b0a55767 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 373ebfbf17a8ecad304f65cb92c4d2d10adc0a19
+refs/heads/master: 56ee48277fa214b3b7b0fd91e7fd3464e12597de
diff --git a/trunk/drivers/char/epca.c b/trunk/drivers/char/epca.c
index 765c5c108bf4..9cad8501d62c 100644
--- a/trunk/drivers/char/epca.c
+++ b/trunk/drivers/char/epca.c
@@ -486,8 +486,7 @@ static void pc_close(struct tty_struct * tty, struct file * filp)
 		} /* End channel is open more than once */
 
 		/* Port open only once go ahead with shutdown & reset */
-		if (ch->count < 0)
-			BUG();
+		BUG_ON(ch->count < 0);
 
 		/* ---------------------------------------------------------------
 			Let the rest of the driver know the channel is being closed.
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
index 48d795bb8c4b..811dadb9ce3e 100644
--- a/trunk/drivers/char/tty_io.c
+++ b/trunk/drivers/char/tty_io.c
@@ -543,14 +543,12 @@ void tty_ldisc_put(int disc)
 	struct tty_ldisc *ld;
 	unsigned long flags;
 	
-	if (disc < N_TTY || disc >= NR_LDISCS)
-		BUG();
+	BUG_ON(disc < N_TTY || disc >= NR_LDISCS);
 		
 	spin_lock_irqsave(&tty_ldisc_lock, flags);
 	ld = &tty_ldiscs[disc];
-	if(ld->refcount == 0)
-		BUG();
-	ld->refcount --;
+	BUG_ON(ld->refcount == 0);
+	ld->refcount--;
 	module_put(ld->owner);
 	spin_unlock_irqrestore(&tty_ldisc_lock, flags);
 }
@@ -645,8 +643,7 @@ void tty_ldisc_deref(struct tty_ldisc *ld)
 {
 	unsigned long flags;
 
-	if(ld == NULL)
-		BUG();
+	BUG_ON(ld == NULL);
 		
 	spin_lock_irqsave(&tty_ldisc_lock, flags);
 	if(ld->refcount == 0)