[SCSI] qla2xxx: Remove spurious taking of ha->vport_slock spinlock.

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / scsi / qla2xxx / qla_init.c

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 48fca47384b745894e0a8a853c8fc937daa196df..39044fc4019471cbac7b645dda21d8d832ffcc93 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -1888,10 +1888,6 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
                qla2x00_init_response_q_entries(rsp);
        }
 
-       spin_lock(&ha->vport_slock);
-
-       spin_unlock(&ha->vport_slock);
-
        ha->tgt.atio_ring_ptr = ha->tgt.atio_ring;
        ha->tgt.atio_ring_index = 0;
        /* Initialize ATIO queue entries */
@@ -1971,6 +1967,7 @@ qla2x00_fw_ready(scsi_qla_host_t *vha)
                    "Waiting for LIP to complete.\n");
 
        do {
+               memset(state, -1, sizeof(state));
                rval = qla2x00_get_firmware_state(vha, state);
                if (rval == QLA_SUCCESS) {
                        if (state[0] < FSTATE_LOSS_OF_SYNC) {