diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 16:18:02 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2008-10-31 16:18:02 +0900 |
| commit | 0803d540db06f53acd2fabf1347d5b665218f14a (patch) | |
| tree | f5f8e5510a76bb59d3583478961daf5afc32df08 /drivers/net/wireless/p54/p54common.c | |
| parent | a8884e3415c29c58a5875d54c109c4a7fcaa6fb4 (diff) | |
| parent | 721d5dfe7e516954c501d5e9d0dfab379cf4241a (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/wireless/p54/p54common.c')
| -rw-r--r-- | drivers/net/wireless/p54/p54common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c index 2d022f83774..827ca0384a4 100644 --- a/drivers/net/wireless/p54/p54common.c +++ b/drivers/net/wireless/p54/p54common.c @@ -319,7 +319,7 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len) void *tmp; int err; u8 *end = (u8 *)eeprom + len; - u16 synth; + u16 synth = 0; DECLARE_MAC_BUF(mac); wrap = (struct eeprom_pda_wrap *) eeprom; @@ -422,7 +422,8 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len) entry = (void *)entry + (entry_len + 1)*2; } - if (!priv->iq_autocal || !priv->output_limit || !priv->curve_data) { + if (!synth || !priv->iq_autocal || !priv->output_limit || + !priv->curve_data) { printk(KERN_ERR "p54: not all required entries found in eeprom!\n"); err = -EINVAL; goto err; |