Commit 66391b38 authored by Cosmin-Gabriel Samoila's avatar Cosmin-Gabriel Samoila Committed by David S. Miller

Drivers: isdn: hisax: isac.c: Fix assignment and check into one expression.

Fix variable assignment inside if statement. It is error-prone and hard to read.
Signed-off-by: default avatarCosmin-Gabriel Samoila <gabrielcsmo@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 995096a0
...@@ -215,9 +215,11 @@ isac_interrupt(struct IsdnCardState *cs, u_char val) ...@@ -215,9 +215,11 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
if (count == 0) if (count == 0)
count = 32; count = 32;
isac_empty_fifo(cs, count); isac_empty_fifo(cs, count);
if ((count = cs->rcvidx) > 0) { count = cs->rcvidx;
if (count > 0) {
cs->rcvidx = 0; cs->rcvidx = 0;
if (!(skb = alloc_skb(count, GFP_ATOMIC))) skb = alloc_skb(count, GFP_ATOMIC);
if (!skb)
printk(KERN_WARNING "HiSax: D receive out of memory\n"); printk(KERN_WARNING "HiSax: D receive out of memory\n");
else { else {
memcpy(skb_put(skb, count), cs->rcvbuf, count); memcpy(skb_put(skb, count), cs->rcvbuf, count);
...@@ -251,7 +253,8 @@ isac_interrupt(struct IsdnCardState *cs, u_char val) ...@@ -251,7 +253,8 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
cs->tx_skb = NULL; cs->tx_skb = NULL;
} }
} }
if ((cs->tx_skb = skb_dequeue(&cs->sq))) { cs->tx_skb = skb_dequeue(&cs->sq);
if (cs->tx_skb) {
cs->tx_cnt = 0; cs->tx_cnt = 0;
isac_fill_fifo(cs); isac_fill_fifo(cs);
} else } else
...@@ -313,7 +316,8 @@ isac_interrupt(struct IsdnCardState *cs, u_char val) ...@@ -313,7 +316,8 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
#if ARCOFI_USE #if ARCOFI_USE
if (v1 & 0x08) { if (v1 & 0x08) {
if (!cs->dc.isac.mon_rx) { if (!cs->dc.isac.mon_rx) {
if (!(cs->dc.isac.mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) { cs->dc.isac.mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC);
if (!cs->dc.isac.mon_rx) {
if (cs->debug & L1_DEB_WARN) if (cs->debug & L1_DEB_WARN)
debugl1(cs, "ISAC MON RX out of memory!"); debugl1(cs, "ISAC MON RX out of memory!");
cs->dc.isac.mocr &= 0xf0; cs->dc.isac.mocr &= 0xf0;
...@@ -343,7 +347,8 @@ isac_interrupt(struct IsdnCardState *cs, u_char val) ...@@ -343,7 +347,8 @@ isac_interrupt(struct IsdnCardState *cs, u_char val)
afterMONR0: afterMONR0:
if (v1 & 0x80) { if (v1 & 0x80) {
if (!cs->dc.isac.mon_rx) { if (!cs->dc.isac.mon_rx) {
if (!(cs->dc.isac.mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC))) { cs->dc.isac.mon_rx = kmalloc(MAX_MON_FRAME, GFP_ATOMIC);
if (!cs->dc.isac.mon_rx) {
if (cs->debug & L1_DEB_WARN) if (cs->debug & L1_DEB_WARN)
debugl1(cs, "ISAC MON RX out of memory!"); debugl1(cs, "ISAC MON RX out of memory!");
cs->dc.isac.mocr &= 0x0f; cs->dc.isac.mocr &= 0x0f;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment