From c0f0be1fd60eb643569bc66c14c9eb3005d06fa1 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Fri, 15 Oct 2010 11:27:38 -0700 Subject: [PATCH] --- yaml --- r: 221479 b: refs/heads/master c: 542bce1f255673816e82eaebb422ead5ad3f5a17 h: refs/heads/master i: 221477: e85d24ce0d254e3abd186e8f3e8bca6b957f9a43 221475: 0e5c213fadc739487a252e1eba6f7d13af4733b3 221471: 00e1713fe9095c1779fe65bb8f0969bff530414b v: v3 --- [refs] | 2 +- trunk/drivers/scsi/qla2xxx/qla_init.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ade21772fbe7..ad7ec729c8e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8479178901557dc323a69ee254c1c732e85e0e5 +refs/heads/master: 542bce1f255673816e82eaebb422ead5ad3f5a17 diff --git a/trunk/drivers/scsi/qla2xxx/qla_init.c b/trunk/drivers/scsi/qla2xxx/qla_init.c index 3cafbef40737..c8d0b121560d 100644 --- a/trunk/drivers/scsi/qla2xxx/qla_init.c +++ b/trunk/drivers/scsi/qla2xxx/qla_init.c @@ -1818,14 +1818,14 @@ qla2x00_init_rings(scsi_qla_host_t *vha) qla2x00_init_response_q_entries(rsp); } - spin_lock_irqsave(&ha->vport_slock, flags); + spin_lock(&ha->vport_slock); /* Clear RSCN queue. */ list_for_each_entry(vp, &ha->vp_list, list) { vp->rscn_in_ptr = 0; vp->rscn_out_ptr = 0; } - spin_unlock_irqrestore(&ha->vport_slock, flags); + spin_unlock(&ha->vport_slock); ha->isp_ops->config_rings(vha);