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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
hisax_isac.c
diff --git
a/drivers/isdn/hisax/hisax_isac.c
b/drivers/isdn/hisax/hisax_isac.c
index
f4972f6
..
d0fefcf
100644
(file)
--- a/
drivers/isdn/hisax/hisax_isac.c
+++ b/
drivers/isdn/hisax/hisax_isac.c
@@
-433,7
+433,7
@@
static void l1m_debug(struct FsmInst *fi, char *fmt, ...)
char buf[256];
va_start(args, fmt);
char buf[256];
va_start(args, fmt);
- vs
printf(buf
, fmt, args);
+ vs
nprintf(buf, sizeof(buf)
, fmt, args);
DBG(DBG_L1M, "%s", buf);
va_end(args);
}
DBG(DBG_L1M, "%s", buf);
va_end(args);
}
@@
-476,12
+476,10
@@
static void isac_fill_fifo(struct isac *isac)
unsigned char cmd;
u_char *ptr;
unsigned char cmd;
u_char *ptr;
- if (!isac->tx_skb)
- BUG();
+ BUG_ON(!isac->tx_skb);
count = isac->tx_skb->len;
count = isac->tx_skb->len;
- if (count <= 0)
- BUG();
+ BUG_ON(count <= 0);
DBG(DBG_IRQ, "count %d", count);
DBG(DBG_IRQ, "count %d", count);
@@
-859,8
+857,7
@@
void isac_d_l2l1(struct hisax_if *hisax_d_if, int pr, void *arg)
dev_kfree_skb(skb);
break;
}
dev_kfree_skb(skb);
break;
}
- if (isac->tx_skb)
- BUG();
+ BUG_ON(isac->tx_skb);
isac->tx_skb = skb;
isac_fill_fifo(isac);
isac->tx_skb = skb;
isac_fill_fifo(isac);