Merge branch 'fixes' into misc

[mirror_ubuntu-bionic-kernel.git] / drivers / scsi / megaraid / megaraid_sas_base.c

diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index a949a2111b08611ece165562e3f3fe43a8f60ec8..e518dadc81615fd4e981b9127e840b9c7adc2d2b 100644 (file)
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -2795,7 +2795,7 @@ static int megasas_reset_bus_host(struct scsi_cmnd *scmd)
                cmd = (struct megasas_cmd_fusion *)scmd->SCp.ptr;
                if (cmd)
                        megasas_dump_frame(cmd->io_request,
-                               sizeof(struct MPI2_RAID_SCSI_IO_REQUEST));
+                               MEGA_MPI2_RAID_DEFAULT_IO_FRAME_SIZE);
                ret = megasas_reset_fusion(scmd->device->host,
                                SCSIIO_TIMEOUT_OCR);
        } else
@@ -6240,8 +6240,8 @@ static int megasas_probe_one(struct pci_dev *pdev,
 fail_start_aen:
 fail_io_attach:
        megasas_mgmt_info.count--;
-       megasas_mgmt_info.instance[megasas_mgmt_info.max_index] = NULL;
        megasas_mgmt_info.max_index--;
+       megasas_mgmt_info.instance[megasas_mgmt_info.max_index] = NULL;
 
        instance->instancet->disable_intr(instance);
        megasas_destroy_irqs(instance);