From 1d97975c236c1df69cd166ff120b9af1584e542d Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Fri, 15 Oct 2010 15:00:06 +0200 Subject: [PATCH] --- yaml --- r: 215367 b: refs/heads/master c: 0d91f22b75347d9503b17a42b6c74d3f7750acd6 h: refs/heads/master i: 215365: ce3bae9cfcbfc36fc2effcf2af39c00673e58b6f 215363: 09fb14b7ef5b318261b9192c0bacf7b61ec0ec40 215359: 952b1da1b7ddb022276353f5b0b5913fc0c20251 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/p54/eeprom.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3ad1ffc49256..6274d4f3b0c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6cf9e995f91e5bbffb2bef85feef490e5b67605d +refs/heads/master: 0d91f22b75347d9503b17a42b6c74d3f7750acd6 diff --git a/trunk/drivers/net/wireless/p54/eeprom.c b/trunk/drivers/net/wireless/p54/eeprom.c index 8c05266d37f4..35b09aa0529b 100644 --- a/trunk/drivers/net/wireless/p54/eeprom.c +++ b/trunk/drivers/net/wireless/p54/eeprom.c @@ -261,8 +261,10 @@ static int p54_generate_channel_lists(struct ieee80211_hw *dev) list->max_entries = max_channel_num; list->channels = kzalloc(sizeof(struct p54_channel_entry) * max_channel_num, GFP_KERNEL); - if (!list->channels) + if (!list->channels) { + ret = -ENOMEM; goto free; + } for (i = 0; i < max_channel_num; i++) { if (i < priv->iq_autocal_len) {