From 542cb4593104ae306970eb181ea42a01f1a79ed2 Mon Sep 17 00:00:00 2001 From: Finn Thain Date: Fri, 3 Oct 2014 11:42:17 +1000 Subject: scsi: Fix "choir" and "beeing" malaprops Signed-off-by: Finn Thain Reviewed-by: Christoph Hellwig Signed-off-by: Jiri Kosina --- drivers/scsi/aha152x.c | 2 +- drivers/scsi/mac_scsi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/scsi') diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c index e77b72f..ee2407b 100644 --- a/drivers/scsi/aha152x.c +++ b/drivers/scsi/aha152x.c @@ -345,7 +345,7 @@ CMD_INC_RESID(struct scsi_cmnd *cmd, int inc) enum { not_issued = 0x0001, /* command not yet issued */ - selecting = 0x0002, /* target is beeing selected */ + selecting = 0x0002, /* target is being selected */ identified = 0x0004, /* IDENTIFY was sent */ disconnected = 0x0008, /* target disconnected */ completed = 0x0010, /* target sent COMMAND COMPLETE */ diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c index 6a039eb..dccce08 100644 --- a/drivers/scsi/mac_scsi.c +++ b/drivers/scsi/mac_scsi.c @@ -360,7 +360,7 @@ const char * macscsi_info (struct Scsi_Host *spnt) { 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. */ -- cgit v1.1 From 4e210519453efb71219b0915cf7bc5343a9dc600 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 22 Oct 2014 11:49:02 +0200 Subject: isci: Spelling s/stucture/structure/ Signed-off-by: Geert Uytterhoeven Cc: James E.J. Bottomley Signed-off-by: Jiri Kosina --- drivers/scsi/isci/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/scsi') diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c index 5d6fda7..c086c07 100644 --- a/drivers/scsi/isci/task.c +++ b/drivers/scsi/isci/task.c @@ -595,7 +595,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); -- cgit v1.1 From 565ccde9603f80c2278032df787d2069ddb2dcf7 Mon Sep 17 00:00:00 2001 From: Alex Pilon Date: Thu, 6 Nov 2014 19:50:40 -0500 Subject: scsi: mpt2sas: fix ioctl in comment Fix 'ioctl' spelling. Signed-off-by: Alex Pilon Acked-by: Sreekanth Reddy Signed-off-by: Jiri Kosina --- drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/scsi') diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.h b/drivers/scsi/mpt2sas/mpt2sas_ctl.h index 8b2ac18..60d76f4 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). -- cgit v1.1 From 6774def6422f6eac53f1828c317bf3b08a8f5a60 Mon Sep 17 00:00:00 2001 From: Masanari Iida Date: Wed, 5 Nov 2014 22:26:48 +0900 Subject: treewide: fix typo in printk and Kconfig This patch fix spelling typo in printk and Kconfig within various part of kernel sources. Signed-off-by: Masanari Iida Acked-by: Randy Dunlap Signed-off-by: Jiri Kosina --- drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/scsi') diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 5640ad1..6edef43 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -6740,7 +6740,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; } -- cgit v1.1 From af222097aaf7f547b7543d5a0d6198d1480db414 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 5 Nov 2014 21:11:10 +1100 Subject: ps3rom: fix error return code Set the return variable to an error code as done elsewhere in the function. Signed-off-by: Julia Lawall Signed-off-by: Michael Ellerman Acked-By: Geoff Levand Signed-off-by: Jiri Kosina --- drivers/scsi/ps3rom.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/scsi') diff --git a/drivers/scsi/ps3rom.c b/drivers/scsi/ps3rom.c index ef23fab..619caf1 100644 --- a/drivers/scsi/ps3rom.c +++ b/drivers/scsi/ps3rom.c @@ -387,6 +387,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; } -- cgit v1.1