wimax: wimax_msg_alloc() returns ERR_PTR not null

[net-next-2.6.git] / drivers / net / wimax / i2400m / rx.c

diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
index 66f968a24d490f60ecc8d7cd91ee005bd49f32c6..0004c686ac68c4c9a338eb70556d4ef9a5c88901 100644 (file)
--- a/drivers/net/wimax/i2400m/rx.c
+++ b/drivers/net/wimax/i2400m/rx.c
@@ -300,17 +300,16 @@ void i2400m_rx_ctl_ack(struct i2400m *i2400m,
                d_printf(1, dev, "Huh? waiter for command reply cancelled\n");
                goto error_waiter_cancelled;
        }
-       if (ack_skb == NULL) {
+       if (IS_ERR(ack_skb))
                dev_err(dev, "CMD/GET/SET ack: cannot allocate SKB\n");
-               i2400m->ack_skb = ERR_PTR(-ENOMEM);
-       } else
-               i2400m->ack_skb = ack_skb;
+       i2400m->ack_skb = ack_skb;
        spin_unlock_irqrestore(&i2400m->rx_lock, flags);
        complete(&i2400m->msg_completion);
        return;
 
 error_waiter_cancelled:
-       kfree_skb(ack_skb);
+       if (!IS_ERR(ack_skb))
+               kfree_skb(ack_skb);
 error_no_waiter:
        spin_unlock_irqrestore(&i2400m->rx_lock, flags);
        return;