From 037b8f61c0fa11c101947431f621354a04eee969 Mon Sep 17 00:00:00 2001
From: Zhu Yi <yi.zhu@intel.com>
Date: Thu, 13 Apr 2006 17:19:50 +0800
Subject: [PATCH] --- yaml --- r: 27289 b: refs/heads/master c:
 d0b526b71569446aaa848cdf4cf3dd8948f0931a h: refs/heads/master i:   27287:
 225dd122eb7b6e3c55a30343223d5bda22aa77c3 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/wireless/ipw2200.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1b0c63a6d0d6..b54222f6d782 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dc81c3071d015a6afb4a04c1bcb6a35ec29df37
+refs/heads/master: d0b526b71569446aaa848cdf4cf3dd8948f0931a
diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c
index 85de9a646f0e..9591ee70f736 100644
--- a/trunk/drivers/net/wireless/ipw2200.c
+++ b/trunk/drivers/net/wireless/ipw2200.c
@@ -10663,6 +10663,7 @@ static int ipw_up(struct ipw_priv *priv)
 		if (priv->cmdlog == NULL) {
 			IPW_ERROR("Error allocating %d command log entries.\n",
 				  cmdlog);
+			return -ENOMEM;
 		} else {
 			memset(priv->cmdlog, 0, sizeof(*priv->cmdlog) * cmdlog);
 			priv->cmdlog_len = cmdlog;