Merge branch 'fixes' into misc

3 files changed, 6 insertions, 3 deletions

diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index b2244eb90776..752b5c9d1ab2 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -541,6 +541,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg)
                 return SCSI_DH_DEV_TEMP_BUSY;
 
  retry:
+        err = 0;
         retval = submit_rtpg(sdev, buff, bufflen, &sense_hdr, pg->flags);
 
         if (retval) {
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c
index 4fb3581d4614..3fa65338d3f5 100644
--- a/drivers/scsi/lpfc/lpfc_mem.c
+++ b/drivers/scsi/lpfc/lpfc_mem.c
@@ -231,13 +231,15 @@ lpfc_mem_free(struct lpfc_hba *phba)
         if (phba->lpfc_hbq_pool)
                 pci_pool_destroy(phba->lpfc_hbq_pool);
         phba->lpfc_hbq_pool = NULL;
-        mempool_destroy(phba->rrq_pool);
+
+        if (phba->rrq_pool)
+                mempool_destroy(phba->rrq_pool);
         phba->rrq_pool = NULL;
 
         /* Free NLP memory pool */
         mempool_destroy(phba->nlp_mem_pool);
         phba->nlp_mem_pool = NULL;
-        if (phba->sli_rev == LPFC_SLI_REV4) {
+        if (phba->sli_rev == LPFC_SLI_REV4 && phba->active_rrq_pool) {
                 mempool_destroy(phba->active_rrq_pool);
                 phba->active_rrq_pool = NULL;
         }
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c
index 5d0ec42a9317..634254a52301 100644
--- a/drivers/scsi/qla1280.c
+++ b/drivers/scsi/qla1280.c
@@ -4214,7 +4214,7 @@ static struct scsi_host_template qla1280_driver_template = {
         .eh_bus_reset_handler   = qla1280_eh_bus_reset,
         .eh_host_reset_handler  = qla1280_eh_adapter_reset,
         .bios_param             = qla1280_biosparam,
-        .can_queue              = 0xfffff,
+        .can_queue              = MAX_OUTSTANDING_COMMANDS,
         .this_id                = -1,
         .sg_tablesize           = SG_ALL,
         .use_clustering         = ENABLE_CLUSTERING,