X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fisdn%2Fhisax%2Fhisax_fcpcipnp.c;fp=drivers%2Fisdn%2Fhisax%2Fhisax_fcpcipnp.c;h=dc7ef957e89708903b5620d175b8a110119091de;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hp=1d7cf3bd6aa336bbf1884869de15436efedcf57d;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c;p=linux-2.6.git

diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c
index 1d7cf3bd6..dc7ef957e 100644
--- a/drivers/isdn/hisax/hisax_fcpcipnp.c
+++ b/drivers/isdn/hisax/hisax_fcpcipnp.c
@@ -387,7 +387,8 @@ static void hdlc_fill_fifo(struct fritz_bcs *bcs)
 
 	DBG(0x40, "hdlc_fill_fifo");
 
-	BUG_ON(skb->len == 0);
+	if (skb->len == 0)
+		BUG();
 
 	bcs->ctrl.sr.cmd &= ~HDLC_CMD_XME;
 	if (bcs->tx_skb->len > bcs->fifo_size) {
@@ -629,7 +630,9 @@ static void fritz_b_l2l1(struct hisax_if *ifc, int pr, void *arg)
 
 	switch (pr) {
 	case PH_DATA | REQUEST:
-		BUG_ON(bcs->tx_skb);
+		if (bcs->tx_skb)
+			BUG();
+		
 		bcs->tx_skb = skb;
 		DBG_SKB(1, skb);
 		hdlc_fill_fifo(bcs);
@@ -725,11 +728,11 @@ static int __devinit fcpcipnp_setup(struct fritz_adapter *adapter)
 
 	switch (adapter->type) {
 	case AVM_FRITZ_PCIV2:
-		retval = request_irq(adapter->irq, fcpci2_irq, IRQF_SHARED,
+		retval = request_irq(adapter->irq, fcpci2_irq, SA_SHIRQ, 
 				     "fcpcipnp", adapter);
 		break;
 	case AVM_FRITZ_PCI:
-		retval = request_irq(adapter->irq, fcpci_irq, IRQF_SHARED,
+		retval = request_irq(adapter->irq, fcpci_irq, SA_SHIRQ,
 				     "fcpcipnp", adapter);
 		break;
 	case AVM_FRITZ_PNP: