Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec21b3b0 authored by Dan Carpenter's avatar Dan Carpenter Committed by James Bottomley
Browse files

[SCSI] lpfc: change spin_lock_irq() to spin_lock() 



In lpfc_cleanup_pending_mbox() we already have IRQs disabled so we don't
need to disable them again.

Also in lpfc_sli_intr_handler() there is a typo where it has
spin_unlock_irq() instead of just spin_unlock().

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Acked-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 7968f194

drivers/scsi/lpfc/lpfc_sli.c

+5 −5
Original line number Diff line number Diff line
@@ -8476,7 +8476,7 @@ lpfc_sli_intr_handler(int irq, void *dev_id) 
	 * If there is deferred error attention, do not check for any interrupt.

	 */

	if (unlikely(phba->hba_flag & DEFER_ERATT)) {

		spin_unlock_irq(&phba->hbalock);

		spin_unlock(&phba->hbalock);

		return IRQ_NONE;

	}
@@ -12827,9 +12827,9 @@ lpfc_cleanup_pending_mbox(struct lpfc_vport *vport) 
			}

			ndlp = (struct lpfc_nodelist *) mb->context2;

			if (ndlp) {

				spin_lock_irq(shost->host_lock);

				spin_lock(shost->host_lock);

				ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL;

				spin_unlock_irq(shost->host_lock);

				spin_unlock(shost->host_lock);

				lpfc_nlp_put(ndlp);

				mb->context2 = NULL;

			}
@@ -12845,9 +12845,9 @@ lpfc_cleanup_pending_mbox(struct lpfc_vport *vport) 
		if (mb->u.mb.mbxCommand == MBX_REG_LOGIN64) {

			ndlp = (struct lpfc_nodelist *) mb->context2;

			if (ndlp) {

				spin_lock_irq(shost->host_lock);

				spin_lock(shost->host_lock);

				ndlp->nlp_flag &= ~NLP_IGNR_REG_CMPL;

				spin_unlock_irq(shost->host_lock);

				spin_unlock(shost->host_lock);

				lpfc_nlp_put(ndlp);

				mb->context2 = NULL;

			}