Commit 3e02a06a authored by Dan Carpenter's avatar Dan Carpenter Committed by Inaky Perez-Gonzalez

wimax: wimax_msg_alloc() returns ERR_PTR not null

wimax_msg_alloc() returns an ERR_PTR and not null.  I changed it to test
for ERR_PTR instead of null.  I also added a check in front of the
kfree() because kfree() can handle null but not ERR_PTR.
Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
parent d3e56c0a
...@@ -300,17 +300,16 @@ void i2400m_rx_ctl_ack(struct i2400m *i2400m, ...@@ -300,17 +300,16 @@ void i2400m_rx_ctl_ack(struct i2400m *i2400m,
d_printf(1, dev, "Huh? waiter for command reply cancelled\n"); d_printf(1, dev, "Huh? waiter for command reply cancelled\n");
goto error_waiter_cancelled; goto error_waiter_cancelled;
} }
if (ack_skb == NULL) { if (IS_ERR(ack_skb))
dev_err(dev, "CMD/GET/SET ack: cannot allocate SKB\n"); dev_err(dev, "CMD/GET/SET ack: cannot allocate SKB\n");
i2400m->ack_skb = ERR_PTR(-ENOMEM); i2400m->ack_skb = ack_skb;
} else
i2400m->ack_skb = ack_skb;
spin_unlock_irqrestore(&i2400m->rx_lock, flags); spin_unlock_irqrestore(&i2400m->rx_lock, flags);
complete(&i2400m->msg_completion); complete(&i2400m->msg_completion);
return; return;
error_waiter_cancelled: error_waiter_cancelled:
kfree_skb(ack_skb); if (!IS_ERR(ack_skb))
kfree_skb(ack_skb);
error_no_waiter: error_no_waiter:
spin_unlock_irqrestore(&i2400m->rx_lock, flags); spin_unlock_irqrestore(&i2400m->rx_lock, flags);
return; return;
......
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