aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2009-07-19 21:53:14 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-07-24 15:05:27 -0400
commite6a3f551bc236010c4d4d99e626e150e98a4c3e6 (patch)
tree5540ba6e323b739473bd00a3b1945ca378316b0f /drivers/net
parentmac80211: fix spare warnings in driver-trace.h (diff)
downloadlinux-dev-e6a3f551bc236010c4d4d99e626e150e98a4c3e6.tar.xz
linux-dev-e6a3f551bc236010c4d4d99e626e150e98a4c3e6.zip
p54: Eliminate unnecessary initialization
In two places, variables are unnecessilarly initialized to NULL. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wireless/p54/eeprom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c
index 549ef2d19cd7..0efe67deedee 100644
--- a/drivers/net/wireless/p54/eeprom.c
+++ b/drivers/net/wireless/p54/eeprom.c
@@ -529,7 +529,7 @@ static struct p54_cal_database *p54_convert_db(struct pda_custom_wrapper *src,
int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
{
struct p54_common *priv = dev->priv;
- struct eeprom_pda_wrap *wrap = NULL;
+ struct eeprom_pda_wrap *wrap;
struct pda_entry *entry;
unsigned int data_len, entry_len;
void *tmp;
@@ -722,7 +722,7 @@ int p54_read_eeprom(struct ieee80211_hw *dev)
struct p54_common *priv = dev->priv;
size_t eeprom_size = 0x2020, offset = 0, blocksize, maxblocksize;
int ret = -ENOMEM;
- void *eeprom = NULL;
+ void *eeprom;
maxblocksize = EEPROM_READBACK_LEN;
if (priv->fw_var >= 0x509)