diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 2 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.c | 2 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_config.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 9276121db1ef..44a07593de56 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c | |||
@@ -688,7 +688,7 @@ static int fcoe_shost_config(struct fc_lport *lport, struct device *dev) | |||
688 | } | 688 | } |
689 | 689 | ||
690 | if (!lport->vport) | 690 | if (!lport->vport) |
691 | fc_host_max_npiv_vports(lport->host) = USHORT_MAX; | 691 | fc_host_max_npiv_vports(lport->host) = USHRT_MAX; |
692 | 692 | ||
693 | snprintf(fc_host_symbolic_name(lport->host), FC_SYMBOLIC_NAME_SIZE, | 693 | snprintf(fc_host_symbolic_name(lport->host), FC_SYMBOLIC_NAME_SIZE, |
694 | "%s v%s over %s", FCOE_NAME, FCOE_VERSION, | 694 | "%s v%s over %s", FCOE_NAME, FCOE_VERSION, |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index b830d61684dd..0ec1ed389c20 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c | |||
@@ -3757,7 +3757,7 @@ _base_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase) | |||
3757 | if (ioc->config_cmds.status & MPT2_CMD_PENDING) { | 3757 | if (ioc->config_cmds.status & MPT2_CMD_PENDING) { |
3758 | ioc->config_cmds.status |= MPT2_CMD_RESET; | 3758 | ioc->config_cmds.status |= MPT2_CMD_RESET; |
3759 | mpt2sas_base_free_smid(ioc, ioc->config_cmds.smid); | 3759 | mpt2sas_base_free_smid(ioc, ioc->config_cmds.smid); |
3760 | ioc->config_cmds.smid = USHORT_MAX; | 3760 | ioc->config_cmds.smid = USHRT_MAX; |
3761 | complete(&ioc->config_cmds.done); | 3761 | complete(&ioc->config_cmds.done); |
3762 | } | 3762 | } |
3763 | break; | 3763 | break; |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_config.c b/drivers/scsi/mpt2sas/mpt2sas_config.c index e762dd3e2fcb..c65442982d7b 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_config.c +++ b/drivers/scsi/mpt2sas/mpt2sas_config.c | |||
@@ -258,7 +258,7 @@ mpt2sas_config_done(struct MPT2SAS_ADAPTER *ioc, u16 smid, u8 msix_index, | |||
258 | #ifdef CONFIG_SCSI_MPT2SAS_LOGGING | 258 | #ifdef CONFIG_SCSI_MPT2SAS_LOGGING |
259 | _config_display_some_debug(ioc, smid, "config_done", mpi_reply); | 259 | _config_display_some_debug(ioc, smid, "config_done", mpi_reply); |
260 | #endif | 260 | #endif |
261 | ioc->config_cmds.smid = USHORT_MAX; | 261 | ioc->config_cmds.smid = USHRT_MAX; |
262 | complete(&ioc->config_cmds.done); | 262 | complete(&ioc->config_cmds.done); |
263 | return 1; | 263 | return 1; |
264 | } | 264 | } |