diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/scsi/lpfc/lpfc_els.c | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_els.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_els.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index 45337cd23feb..a14ab4580d4e 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c | |||
@@ -802,7 +802,7 @@ lpfc_cmpl_els_flogi(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, | |||
802 | 802 | ||
803 | /* FLOGI completes successfully */ | 803 | /* FLOGI completes successfully */ |
804 | lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS, | 804 | lpfc_printf_vlog(vport, KERN_INFO, LOG_ELS, |
805 | "0101 FLOGI completes sucessfully " | 805 | "0101 FLOGI completes successfully " |
806 | "Data: x%x x%x x%x x%x\n", | 806 | "Data: x%x x%x x%x x%x\n", |
807 | irsp->un.ulpWord[4], sp->cmn.e_d_tov, | 807 | irsp->un.ulpWord[4], sp->cmn.e_d_tov, |
808 | sp->cmn.w2.r_a_tov, sp->cmn.edtovResolution); | 808 | sp->cmn.w2.r_a_tov, sp->cmn.edtovResolution); |
@@ -4133,7 +4133,7 @@ lpfc_els_rcv_rscn(struct lpfc_vport *vport, struct lpfc_iocbq *cmdiocb, | |||
4133 | /* Indicate we are walking fc_rscn_id_list on this vport */ | 4133 | /* Indicate we are walking fc_rscn_id_list on this vport */ |
4134 | vport->fc_rscn_flush = 1; | 4134 | vport->fc_rscn_flush = 1; |
4135 | spin_unlock_irq(shost->host_lock); | 4135 | spin_unlock_irq(shost->host_lock); |
4136 | /* Get the array count after sucessfully have the token */ | 4136 | /* Get the array count after successfully have the token */ |
4137 | rscn_cnt = vport->fc_rscn_id_cnt; | 4137 | rscn_cnt = vport->fc_rscn_id_cnt; |
4138 | /* If we are already processing an RSCN, save the received | 4138 | /* If we are already processing an RSCN, save the received |
4139 | * RSCN payload buffer, cmdiocb->context2 to process later. | 4139 | * RSCN payload buffer, cmdiocb->context2 to process later. |