summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhu Yi <yi.zhu@intel.com>2006-04-13 11:19:50 +0200
committerJohn W. Linville <linville@tuxdriver.com>2006-04-24 22:15:55 +0200
commitd0b526b71569446aaa848cdf4cf3dd8948f0931a (patch)
treea21580d1a8c7b43aeae621935e979751ab7f93d2
parent[PATCH] ipw2200: fix compile warning when !CONFIG_IPW2200_DEBUG (diff)
downloadlinux-d0b526b71569446aaa848cdf4cf3dd8948f0931a.tar.xz
linux-d0b526b71569446aaa848cdf4cf3dd8948f0931a.zip
[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>
-rw-r--r--drivers/net/wireless/ipw2200.c1
1 files changed, 1 insertions, 0 deletions
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;