o Merge with Linux 2.1.116.

 o New Newport console code.
 o New G364 console code.

6 files changed, 21 insertions, 11 deletions

diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c
index 734ec8bd3..c42a2bb56 100644
--- a/drivers/isdn/hisax/hfc_2bds0.c
+++ b/drivers/isdn/hisax/hfc_2bds0.c
@@ -1042,7 +1042,7 @@ hfc2bds0_interrupt(struct IsdnCardState *cs, u_char val)
 				del_timer(&cs->dbusytimer);
 			if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags))
 				sched_event_D(cs, D_CLEARBUSY);
-			if (cs->tx_skb)
+			if (cs->tx_skb) {
 				if (cs->tx_skb->len) {
 					if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) {
 						hfc_fill_dfifo(cs);
@@ -1056,6 +1056,7 @@ hfc2bds0_interrupt(struct IsdnCardState *cs, u_char val)
 					cs->tx_cnt = 0;
 					cs->tx_skb = NULL;
 				}
+			}
 			if ((cs->tx_skb = skb_dequeue(&cs->sq))) {
 				cs->tx_cnt = 0;
 				if (!test_and_set_bit(FLG_LOCK_ATOMIC, &cs->HW_Flags)) {
diff --git a/drivers/isdn/hisax/hscx_irq.c b/drivers/isdn/hisax/hscx_irq.c
index 64e80e7b2..992ec813b 100644
--- a/drivers/isdn/hisax/hscx_irq.c
+++ b/drivers/isdn/hisax/hscx_irq.c
@@ -219,7 +219,7 @@ hscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx)
 		}
 	}
 	if (val & 0x10) {	/* XPR */
-		if (bcs->hw.hscx.tx_skb)
+		if (bcs->hw.hscx.tx_skb) {
 			if (bcs->hw.hscx.tx_skb->len) {
 				hscx_fill_fifo(bcs);
 				return;
@@ -231,6 +231,7 @@ hscx_interrupt(struct IsdnCardState *cs, u_char val, u_char hscx)
 				bcs->hw.hscx.count = 0; 
 				bcs->hw.hscx.tx_skb = NULL;
 			}
+		}
 		if ((bcs->hw.hscx.tx_skb = skb_dequeue(&bcs->squeue))) {
 			bcs->hw.hscx.count = 0;
 			test_and_set_bit(BC_FLG_BUSY, &bcs->Flag);
diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c
index 9a2624ef4..f8458364c 100644
--- a/drivers/isdn/hisax/isac.c
+++ b/drivers/isdn/hisax/isac.c
@@ -305,7 +305,7 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
 			del_timer(&cs->dbusytimer);
 		if (test_and_clear_bit(FLG_L1_DBUSY, &cs->HW_Flags))
 			isac_sched_event(cs, D_CLEARBUSY);
-		if (cs->tx_skb)
+		if (cs->tx_skb) {
 			if (cs->tx_skb->len) {
 				isac_fill_fifo(cs);
 				goto afterXPR;
@@ -314,6 +314,7 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
 				cs->tx_cnt = 0;
 				cs->tx_skb = NULL;
 			}
+		}
 		if ((cs->tx_skb = skb_dequeue(&cs->sq))) {
 			cs->tx_cnt = 0;
 			isac_fill_fifo(cs);
@@ -348,7 +349,7 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
 			}
 #if ARCOFI_USE
 			if (v1 & 0x08) {
-				if (!cs->mon_rx)
+				if (!cs->mon_rx) {
 					if (!(cs->mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) {
 						if (cs->debug & L1_DEB_WARN)
 							debugl1(cs, "ISAC MON RX out of memory!");
@@ -358,6 +359,7 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
 						goto afterMONR0;
 					} else
 						cs->mon_rxp = 0;
+				}
 				if (cs->mon_rxp >= MAX_MON_FRAME) {
 					cs->mocr &= 0xf0;
 					cs->mocr |= 0x0a;
@@ -379,7 +381,7 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
 			}
 		      afterMONR0:
 			if (v1 & 0x80) {
-				if (!cs->mon_rx)
+				if (!cs->mon_rx) {
 					if (!(cs->mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) {
 						if (cs->debug & L1_DEB_WARN)
 							debugl1(cs, "ISAC MON RX out of memory!");
@@ -389,6 +391,7 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
 						goto afterMONR1;
 					} else
 						cs->mon_rxp = 0;
+				}
 				if (cs->mon_rxp >= MAX_MON_FRAME) {
 					cs->mocr &= 0x0f;
 					cs->mocr |= 0xa0;
diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c
index eadfa4c8a..824ba16c3 100644
--- a/drivers/isdn/hisax/isdnl2.c
+++ b/drivers/isdn/hisax/isdnl2.c
@@ -650,11 +650,12 @@ l2_got_ua(struct FsmInst *fi, int event, void *arg)
 			FsmAddTimer(&st->l2.t200, st->l2.T200, EV_L2_T200, NULL, 4);
 			test_and_set_bit(FLG_T200_RUN, &st->l2.flag);
 		} else {
-			if (!test_and_clear_bit(FLG_L3_INIT, &st->l2.flag))
+			if (!test_and_clear_bit(FLG_L3_INIT, &st->l2.flag)) {
 				if (st->l2.vs != st->l2.va)
 					discard_i_queue(st);
 				else
 					est = 0;
+			}
 			st->l2.vs = 0;
 			st->l2.va = 0;
 			st->l2.vr = 0;
diff --git a/drivers/isdn/hisax/rawhdlc.c b/drivers/isdn/hisax/rawhdlc.c
index 16938bc98..b878cb699 100644
--- a/drivers/isdn/hisax/rawhdlc.c
+++ b/drivers/isdn/hisax/rawhdlc.c
@@ -135,7 +135,7 @@
 #include "rawhdlc.h"
 
 /* There's actually an identical copy of this table in the PPP code
- * (ppp_crc16_table), but I don't want this code dependant on PPP
+ * (ppp_crc16_table), but I don't want this code dependent on PPP
  */
 
 // static 
diff --git a/drivers/isdn/hisax/teles3.c b/drivers/isdn/hisax/teles3.c
index 261d054fb..871b10e4a 100644
--- a/drivers/isdn/hisax/teles3.c
+++ b/drivers/isdn/hisax/teles3.c
@@ -216,12 +216,13 @@ release_io_teles3(struct IsdnCardState *cs)
 	if (cs->typ == ISDN_CTYPE_TELESPCMCIA)
 		release_region(cs->hw.teles3.cfg_reg, 97);
 	else {
-		if (cs->hw.teles3.cfg_reg)
+		if (cs->hw.teles3.cfg_reg) {
 			if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) {
 				release_region(cs->hw.teles3.cfg_reg, 1);
 			} else {
 				release_region(cs->hw.teles3.cfg_reg, 8);
 			}
+		}
 		release_ioregs(cs, 0x7);
 	}
 }
@@ -399,12 +400,13 @@ setup_teles3(struct IsdnCard *card))
 			       CardType[cs->typ],
 			       cs->hw.teles3.isac + 32,
 			       cs->hw.teles3.isac + 64);
-			if (cs->hw.teles3.cfg_reg)
+			if (cs->hw.teles3.cfg_reg) {
 				if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) {
 					release_region(cs->hw.teles3.cfg_reg, 1);
 				} else {
 					release_region(cs->hw.teles3.cfg_reg, 8);
 				}
+			}
 			return (0);
 		} else
 			request_region(cs->hw.teles3.isac + 32, 32, "HiSax isac");
@@ -414,12 +416,13 @@ setup_teles3(struct IsdnCard *card))
 			       CardType[cs->typ],
 			       cs->hw.teles3.hscx[0] + 32,
 			       cs->hw.teles3.hscx[0] + 64);
-			if (cs->hw.teles3.cfg_reg)
+			if (cs->hw.teles3.cfg_reg) {
 				if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) {
 					release_region(cs->hw.teles3.cfg_reg, 1);
 				} else {
 					release_region(cs->hw.teles3.cfg_reg, 8);
 				}
+			}
 			release_ioregs(cs, 1);
 			return (0);
 		} else
@@ -430,12 +433,13 @@ setup_teles3(struct IsdnCard *card))
 			       CardType[cs->typ],
 			       cs->hw.teles3.hscx[1] + 32,
 			       cs->hw.teles3.hscx[1] + 64);
-			if (cs->hw.teles3.cfg_reg)
+			if (cs->hw.teles3.cfg_reg) {
 				if (cs->typ == ISDN_CTYPE_COMPAQ_ISA) {
 					release_region(cs->hw.teles3.cfg_reg, 1);
 				} else {
 					release_region(cs->hw.teles3.cfg_reg, 8);
 				}
+			}
 			release_ioregs(cs, 3);
 			return (0);
 		} else