Pull trivial into release branch

[mv-sheeva.git] / drivers / isdn / hisax / hisax_isac.c

diff --git a/drivers/isdn/hisax/hisax_isac.c b/drivers/isdn/hisax/hisax_isac.c
index f4972f6c1f5d29da36e98b34d8511194f8bdb140..81eac344bb0325fcf615a5808e52fb87401eb640 100644 (file)
--- a/drivers/isdn/hisax/hisax_isac.c
+++ b/drivers/isdn/hisax/hisax_isac.c
@@ -476,12 +476,10 @@ static void isac_fill_fifo(struct isac *isac)
        unsigned char cmd;
        u_char *ptr;
 
-       if (!isac->tx_skb)
-               BUG();
+       BUG_ON(!isac->tx_skb);
 
        count = isac->tx_skb->len;
-       if (count <= 0)
-               BUG();
+       BUG_ON(count <= 0);
 
        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;
                }
-               if (isac->tx_skb)
-                       BUG();
+               BUG_ON(isac->tx_skb);
 
                isac->tx_skb = skb;
                isac_fill_fifo(isac);