Merge tag 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[~andy/linux] / drivers / scsi / qla4xxx / ql4_os.c

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index c75ca26298d65d2b986a1c7ef7856ad1fb863c68..79243b76d17ef9c7a72ed404dabf2cbeb1f941f5 100644 (file)
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -803,7 +803,7 @@ static void qla4xxx_conn_get_stats(struct iscsi_cls_conn *cls_conn,
                                     iscsi_stats_dma);
        if (ret != QLA_SUCCESS) {
                ql4_printk(KERN_ERR, ha,
-                          "Unable to retreive iscsi stats\n");
+                          "Unable to retrieve iscsi stats\n");
                goto free_stats;
        }
 
@@ -4338,7 +4338,7 @@ static int qla4xxx_compare_tuple_ddb(struct scsi_qla_host *ha,
                return QLA_ERROR;
 
        /* For multi sessions, driver generates the ISID, so do not compare
-        * ISID in reset path since it would be a comparision between the
+        * ISID in reset path since it would be a comparison between the
         * driver generated ISID and firmware generated ISID. This could
         * lead to adding duplicated DDBs in the list as driver generated
         * ISID would not match firmware generated ISID.
@@ -5326,7 +5326,7 @@ static void qla4xxx_destroy_fw_ddb_session(struct scsi_qla_host *ha)
        }
 }
 /**
- * qla4xxx_remove_adapter - calback function to remove adapter.
+ * qla4xxx_remove_adapter - callback function to remove adapter.
  * @pci_dev: PCI device pointer
  **/
 static void __devexit qla4xxx_remove_adapter(struct pci_dev *pdev)