git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
hisax_fcpcipnp.c
diff --git
a/drivers/isdn/hisax/hisax_fcpcipnp.c
b/drivers/isdn/hisax/hisax_fcpcipnp.c
index
1d7cf3b
..
dc7ef95
100644
(file)
--- 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");
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) {
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:
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);
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:
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:
"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:
"fcpcipnp", adapter);
break;
case AVM_FRITZ_PNP: