From 8f6090c77c44b3df47a26a939320af4f95bde147 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Thu, 22 Apr 2010 11:46:32 +0200 Subject: [PATCH] --- yaml --- r: 195123 b: refs/heads/master c: 3e02a06ae3dce2eb804bb4afadb7067c80d6c096 h: refs/heads/master i: 195121: 0cefeac74f31f304c893d94b7db67617e3656b02 195119: fa3f4bdf7670b3029ff8d19c64d4b2783b10744e v: v3 --- [refs] | 2 +- trunk/drivers/net/wimax/i2400m/rx.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 8375c3276545..d8f7f3ac867f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3e56c0ad8a2dab7ffd6179b64f00702149e5c9a +refs/heads/master: 3e02a06ae3dce2eb804bb4afadb7067c80d6c096 diff --git a/trunk/drivers/net/wimax/i2400m/rx.c b/trunk/drivers/net/wimax/i2400m/rx.c index 66f968a24d49..0004c686ac68 100644 --- a/trunk/drivers/net/wimax/i2400m/rx.c +++ b/trunk/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;