diff options
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/isci/task.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/mac_scsi.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_base.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 | ||||
| -rw-r--r-- | drivers/scsi/ps3rom.c | 1 |
5 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c index 3f63c6318b0d..6dcaed0c1fc8 100644 --- a/drivers/scsi/isci/task.c +++ b/drivers/scsi/isci/task.c @@ -588,7 +588,7 @@ int isci_task_abort_task(struct sas_task *task) ret = TMF_RESP_FUNC_COMPLETE; } else { - /* Fill in the tmf stucture */ + /* Fill in the tmf structure */ isci_task_build_abort_task_tmf(&tmf, isci_tmf_ssp_task_abort, old_request); diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c index 953fd9b953c7..1e85c07e3b62 100644 --- a/drivers/scsi/mac_scsi.c +++ b/drivers/scsi/mac_scsi.c @@ -166,7 +166,7 @@ static void mac_scsi_reset_boot(struct Scsi_Host *instance) XXX: Since bus errors in the PDMA routines never happen on my computer, the bus error code is untested. If the code works as intended, a bus error results in Pseudo-DMA - beeing disabled, meaning that the driver switches to slow handshake. + being disabled, meaning that the driver switches to slow handshake. If bus errors are NOT extremely rare, this has to be changed. */ diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index f05580e693d0..ff283d23788a 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -6783,7 +6783,7 @@ static int __init megasas_init(void) rval = pci_register_driver(&megasas_pci_driver); if (rval) { - printk(KERN_DEBUG "megasas: PCI hotplug regisration failed \n"); + printk(KERN_DEBUG "megasas: PCI hotplug registration failed \n"); goto err_pcidrv; } diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.h b/drivers/scsi/mpt2sas/mpt2sas_ctl.h index fa0567c96050..7f842c88abd2 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.h +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.h @@ -224,7 +224,7 @@ struct mpt2_ioctl_eventreport { }; /** - * struct mpt2_ioctl_command - generic mpt firmware passthru ioclt + * struct mpt2_ioctl_command - generic mpt firmware passthru ioctl * @hdr - generic header * @timeout - command timeout in seconds. (if zero then use driver default * value). diff --git a/drivers/scsi/ps3rom.c b/drivers/scsi/ps3rom.c index b3b48b5a984c..5298def33733 100644 --- a/drivers/scsi/ps3rom.c +++ b/drivers/scsi/ps3rom.c @@ -383,6 +383,7 @@ static int ps3rom_probe(struct ps3_system_bus_device *_dev) if (!host) { dev_err(&dev->sbd.core, "%s:%u: scsi_host_alloc failed\n", __func__, __LINE__); + error = -ENOMEM; goto fail_teardown; } |