From: Zhu Yi <yi.zhu@intel.com>
Date: Thu, 13 Apr 2006 09:19:50 +0000 (+0800)
Subject: [PATCH] ipw2200: Do not continue loading the firmware if kmalloc fails
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d0b526b71569446aaa848cdf4cf3dd8948f0931a;p=deliverable%2Flinux.git

[PATCH] ipw2200: Do not continue loading the firmware if kmalloc fails

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: "Zhu, Yi" <yi.zhu@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 85de9a646f0e..9591ee70f736 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/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;