diff options
author | Takashi Iwai <tiwai@suse.de> | 2017-06-07 11:25:30 +0300 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2017-06-07 11:25:30 +0300 |
commit | 4c7aba46c9e82aa236502760a677e666589afead (patch) | |
tree | 9baa94b072fa58c674c34b8ddaec8b9e727e1657 /drivers/scsi/lpfc/lpfc_ct.c | |
parent | d2dc2a96de9d58038ac1f9ee432e88a70958d59b (diff) | |
parent | ba3021b2c79b2fa9114f92790a99deb27a65b728 (diff) | |
download | linux-4c7aba46c9e82aa236502760a677e666589afead.tar.xz |
Merge branch 'for-linus' into for-next
For applying more ALSA timer cleanups.
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_ct.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_ct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c index 1487406aea77..c7962dae4dab 100644 --- a/drivers/scsi/lpfc/lpfc_ct.c +++ b/drivers/scsi/lpfc/lpfc_ct.c @@ -630,7 +630,7 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint8_t fc4_type, NLP_EVT_DEVICE_RECOVERY); spin_lock_irq(shost->host_lock); ndlp->nlp_flag &= ~NLP_NVMET_RECOV; - spin_lock_irq(shost->host_lock); + spin_unlock_irq(shost->host_lock); } } |