X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fisdn%2Fhisax%2Fhisax_fcpcipnp.c;h=dc7ef957e89708903b5620d175b8a110119091de;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=dbcca287ee2c5b7dcffddd4684385918ac47361b;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git diff --git a/drivers/isdn/hisax/hisax_fcpcipnp.c b/drivers/isdn/hisax/hisax_fcpcipnp.c index dbcca287e..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);