vserver 1.9.5.x5

[linux-2.6.git] / drivers / message / fusion / mptlan.c

diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index 5327c92..ef2713b 100644 (file)
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -179,7 +179,7 @@ static u32 tx_max_out_p = 127 - 16;
 
 #ifdef QLOGIC_NAA_WORKAROUND
 static struct NAA_Hosed *mpt_bad_naa = NULL;
-rwlock_t bad_naa_lock = RW_LOCK_UNLOCKED;
+DEFINE_RWLOCK(bad_naa_lock);
 #endif
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
@@ -1401,8 +1401,8 @@ mpt_register_lan_device (MPT_ADAPTER *mpt_dev, int pnum)
                        priv->max_buckets_out));
 
        priv->bucketthresh = priv->max_buckets_out * 2 / 3;
-       priv->txfidx_lock = SPIN_LOCK_UNLOCKED;
-       priv->rxfidx_lock = SPIN_LOCK_UNLOCKED;
+       spin_lock_init(&priv->txfidx_lock);
+       spin_lock_init(&priv->rxfidx_lock);
 
        memset(&priv->stats, 0, sizeof(priv->stats));