aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorZhu Yi <yi.zhu@intel.com>2006-04-13 05:19:50 -0400
committerJohn W. Linville <linville@tuxdriver.com>2006-04-24 16:15:55 -0400
commitd0b526b71569446aaa848cdf4cf3dd8948f0931a (patch)
treea21580d1a8c7b43aeae621935e979751ab7f93d2 /drivers/net
parent5dc81c3071d015a6afb4a04c1bcb6a35ec29df37 (diff)
[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>
Diffstat (limited to 'drivers/net')
-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)
10663 if (priv->cmdlog == NULL) { 10663 if (priv->cmdlog == NULL) {
10664 IPW_ERROR("Error allocating %d command log entries.\n", 10664 IPW_ERROR("Error allocating %d command log entries.\n",
10665 cmdlog); 10665 cmdlog);
10666 return -ENOMEM;
10666 } else { 10667 } else {
10667 memset(priv->cmdlog, 0, sizeof(*priv->cmdlog) * cmdlog); 10668 memset(priv->cmdlog, 0, sizeof(*priv->cmdlog) * cmdlog);
10668 priv->cmdlog_len = cmdlog; 10669 priv->cmdlog_len = cmdlog;