aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/message/fusion/mptlan.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index 952e14851401..b550471e3042 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -1345,10 +1345,11 @@ mpt_lan_post_receive_buckets_work(struct work_struct *work)
1345static struct net_device * 1345static struct net_device *
1346mpt_register_lan_device (MPT_ADAPTER *mpt_dev, int pnum) 1346mpt_register_lan_device (MPT_ADAPTER *mpt_dev, int pnum)
1347{ 1347{
1348 struct net_device *dev = alloc_fcdev(sizeof(struct mpt_lan_priv)); 1348 struct net_device *dev;
1349 struct mpt_lan_priv *priv = NULL; 1349 struct mpt_lan_priv *priv;
1350 u8 HWaddr[FC_ALEN], *a; 1350 u8 HWaddr[FC_ALEN], *a;
1351 1351
1352 dev = alloc_fcdev(sizeof(struct mpt_lan_priv));
1352 if (!dev) 1353 if (!dev)
1353 return NULL; 1354 return NULL;
1354 1355
@@ -1360,7 +1361,6 @@ mpt_register_lan_device (MPT_ADAPTER *mpt_dev, int pnum)
1360 priv->mpt_dev = mpt_dev; 1361 priv->mpt_dev = mpt_dev;
1361 priv->pnum = pnum; 1362 priv->pnum = pnum;
1362 1363
1363 memset(&priv->post_buckets_task, 0, sizeof(priv->post_buckets_task));
1364 INIT_DELAYED_WORK(&priv->post_buckets_task, 1364 INIT_DELAYED_WORK(&priv->post_buckets_task,
1365 mpt_lan_post_receive_buckets_work); 1365 mpt_lan_post_receive_buckets_work);
1366 priv->post_buckets_active = 0; 1366 priv->post_buckets_active = 0;
@@ -1385,8 +1385,6 @@ mpt_register_lan_device (MPT_ADAPTER *mpt_dev, int pnum)
1385 spin_lock_init(&priv->txfidx_lock); 1385 spin_lock_init(&priv->txfidx_lock);
1386 spin_lock_init(&priv->rxfidx_lock); 1386 spin_lock_init(&priv->rxfidx_lock);
1387 1387
1388 memset(&priv->stats, 0, sizeof(priv->stats));
1389
1390 /* Grab pre-fetched LANPage1 stuff. :-) */ 1388 /* Grab pre-fetched LANPage1 stuff. :-) */
1391 a = (u8 *) &mpt_dev->lan_cnfg_page1.HardwareAddressLow; 1389 a = (u8 *) &mpt_dev->lan_cnfg_page1.HardwareAddressLow;
1392 1390