diff options
author | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 13:48:12 -0700 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-10-07 13:48:12 -0700 |
commit | 19ac97ff701ae3c0eda09dd88f590806f1c4eb2d (patch) | |
tree | 62bb6b6358783dc9d6c26f480fa378843abb0235 /drivers/scsi/lpfc/lpfc_debugfs.c | |
parent | 24c20f10583647e30afe87b6f6d5e14bc7b1cbc6 (diff) | |
parent | e785060ea3a1c8e37a8bc1449c79e36bff2b5b13 (diff) |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.18' into for-linus
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_debugfs.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_debugfs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c index b0aedce3f54b..786a2aff7b59 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.c +++ b/drivers/scsi/lpfc/lpfc_debugfs.c @@ -269,7 +269,7 @@ static int lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size) { int len = 0; - int cnt, i, j, found, posted, low; + int i, j, found, posted, low; uint32_t phys, raw_index, getidx; struct lpfc_hbq_init *hip; struct hbq_s *hbqs; @@ -279,7 +279,7 @@ lpfc_debugfs_hbqinfo_data(struct lpfc_hba *phba, char *buf, int size) if (phba->sli_rev != 3) return 0; - cnt = LPFC_HBQINFO_SIZE; + spin_lock_irq(&phba->hbalock); /* toggle between multiple hbqs, if any */ |