Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[sfrench/cifs-2.6.git] / drivers / scsi / qla2xxx / qla_mid.c

diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index c0f8f6c17b793384cd9f9c70ef34f8ec945642e7..bd9f14bf7ac2e72624a6ab14b5b88c8558623bf7 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -487,7 +487,7 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
        atomic_set(&vha->loop_state, LOOP_DOWN);
        atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);
 
-       qla2x00_start_timer(vha, qla2x00_timer, WATCH_INTERVAL);
+       qla2x00_start_timer(vha, WATCH_INTERVAL);
 
        vha->req = base_vha->req;
        host->can_queue = base_vha->req->length + 128;
@@ -606,7 +606,7 @@ qla25xx_delete_queues(struct scsi_qla_host *vha)
        struct qla_hw_data *ha = vha->hw;
        struct qla_qpair *qpair, *tqpair;
 
-       if (ql2xmqsupport) {
+       if (ql2xmqsupport || ql2xnvmeenable) {
                list_for_each_entry_safe(qpair, tqpair, &vha->qp_list,
                    qp_list_elem)
                        qla2xxx_delete_qpair(vha, qpair);