Skip to content

Commit a7cb7bb

Browse files
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree update from Jiri Kosina: "Usual stuff: documentation updates, printk() fixes, etc" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits) intel_ips: fix a type in error message cpufreq: cpufreq-dt: Move newline to end of error message ps3rom: fix error return code treewide: fix typo in printk and Kconfig ARM: dts: bcm63138: change "interupts" to "interrupts" Replace mentions of "list_struct" to "list_head" kernel: trace: fix printk message scsi: mpt2sas: fix ioctl in comment zbud, zswap: change module author email clocksource: Fix 'clcoksource' typo in comment arm: fix wording of "Crotex" in CONFIG_ARCH_EXYNOS3 help gpio: msm-v1: make boolean argument more obvious usb: Fix typo in usb-serial-simple.c PCI: Fix comment typo 'COMFIG_PM_OPS' powerpc: Fix comment typo 'CONIFG_8xx' powerpc: Fix comment typos 'CONFiG_ALTIVEC' clk: st: Spelling s/stucture/structure/ isci: Spelling s/stucture/structure/ usb: gadget: zero: Spelling s/infrastucture/infrastructure/ treewide: Fix company name in module descriptions ...
2 parents ccb5a49 + 078014d commit a7cb7bb

File tree

52 files changed

+92
-92
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+92
-92
lines changed

Documentation/devicetree/bindings/clock/st/st,flexgen.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Please find an example below:
1111

1212
Clockgen block diagram
1313
-------------------------------------------------------------------
14-
| Flexgen stucture |
14+
| Flexgen structure |
1515
| --------------------------------------------- |
1616
| | ------- -------- -------- | |
1717
clk_sysin | | | | | | | | |

Documentation/scsi/scsi_eh.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ ways.
172172

173173
- eh_strategy_handler() callback
174174
This is one big callback which should perform whole error
175-
handling. As such, it should do all choirs SCSI midlayer
175+
handling. As such, it should do all chores the SCSI midlayer
176176
performs during recovery. This will be discussed in [2-2].
177177

178178
Once recovery is complete, SCSI EH resumes normal operation by
@@ -428,7 +428,7 @@ scmd->allowed.
428428
scsi_unjam_host() and it is responsible for whole recovery process.
429429
On completion, the handler should have made lower layers forget about
430430
all failed scmds and either ready for new commands or offline. Also,
431-
it should perform SCSI EH maintenance choirs to maintain integrity of
431+
it should perform SCSI EH maintenance chores to maintain integrity of
432432
SCSI midlayer. IOW, of the steps described in [2-1-2], all steps
433433
except for #1 must be implemented by eh_strategy_handler().
434434

Documentation/usb/gadget_configfs.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ functions and binds them. This way the whole gadget is bound.
376376
configured, so config_groups for particular functions are defined
377377
in the functions implementation files drivers/usb/gadget/f_*.c.
378378

379-
5. Funciton's code is written in such a way that it uses
379+
5. Function's code is written in such a way that it uses
380380

381381
usb_get_function_instance(), which, in turn, calls request_module.
382382
So, provided that modprobe works, modules for particular functions

arch/arm/boot/dts/bcm63138.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
twd_watchdog: watchdog@1e620 {
103103
compatible = "arm,cortex-a9-twd-wdt";
104104
reg = <0x1e620 0x20>;
105-
interupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;
105+
interrupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;
106106
};
107107
};
108108

arch/arm/mach-exynos/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ config ARCH_EXYNOS3
3434
bool "SAMSUNG EXYNOS3"
3535
select ARM_CPU_SUSPEND if PM
3636
help
37-
Samsung EXYNOS3 (Crotex-A7) SoC based systems
37+
Samsung EXYNOS3 (Cortex-A7) SoC based systems
3838

3939
config ARCH_EXYNOS4
4040
bool "SAMSUNG EXYNOS4"

arch/mips/cavium-octeon/setup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,7 @@ static int __init edac_devinit(void)
10921092
name = edac_device_names[i];
10931093
dev = platform_device_register_simple(name, -1, NULL, 0);
10941094
if (IS_ERR(dev)) {
1095-
pr_err("Registation of %s failed!\n", name);
1095+
pr_err("Registration of %s failed!\n", name);
10961096
err = PTR_ERR(dev);
10971097
}
10981098
}
@@ -1103,7 +1103,7 @@ static int __init edac_devinit(void)
11031103
dev = platform_device_register_simple("octeon_lmc_edac",
11041104
i, NULL, 0);
11051105
if (IS_ERR(dev)) {
1106-
pr_err("Registation of octeon_lmc_edac %d failed!\n", i);
1106+
pr_err("Registration of octeon_lmc_edac %d failed!\n", i);
11071107
err = PTR_ERR(dev);
11081108
}
11091109
}

arch/mips/pci/pci-octeon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -708,7 +708,7 @@ static int __init octeon_pci_setup(void)
708708

709709
if (IS_ERR(platform_device_register_simple("octeon_pci_edac",
710710
-1, NULL, 0)))
711-
pr_err("Registation of co_pci_edac failed!\n");
711+
pr_err("Registration of co_pci_edac failed!\n");
712712

713713
octeon_pci_dma_init();
714714

arch/powerpc/kvm/e500_mmu_host.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
661661
if (unlikely((pr && !(mas3 & MAS3_UX)) ||
662662
(!pr && !(mas3 & MAS3_SX)))) {
663663
pr_err_ratelimited(
664-
"%s: Instuction emulation from guest addres %08lx without execute permission\n",
664+
"%s: Instruction emulation from guest address %08lx without execute permission\n",
665665
__func__, geaddr);
666666
return EMULATE_AGAIN;
667667
}
@@ -673,7 +673,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
673673
if (has_feature(vcpu, VCPU_FTR_MMU_V2) &&
674674
unlikely((mas2 & MAS2_I) || (mas2 & MAS2_W) || !(mas2 & MAS2_M))) {
675675
pr_err_ratelimited(
676-
"%s: Instuction emulation from guest addres %08lx mismatches storage attributes\n",
676+
"%s: Instruction emulation from guest address %08lx mismatches storage attributes\n",
677677
__func__, geaddr);
678678
return EMULATE_AGAIN;
679679
}
@@ -686,7 +686,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
686686

687687
/* Guard against emulation from devices area */
688688
if (unlikely(!page_is_ram(pfn))) {
689-
pr_err_ratelimited("%s: Instruction emulation from non-RAM host addres %08llx is not supported\n",
689+
pr_err_ratelimited("%s: Instruction emulation from non-RAM host address %08llx is not supported\n",
690690
__func__, addr);
691691
return EMULATE_AGAIN;
692692
}

arch/powerpc/lib/copyuser_power7.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -718,4 +718,4 @@ err3; stb r0,0(r3)
718718

719719
15: addi r1,r1,STACKFRAMESIZE
720720
b exit_vmx_usercopy /* tail call optimise */
721-
#endif /* CONFiG_ALTIVEC */
721+
#endif /* CONFIG_ALTIVEC */

arch/powerpc/lib/memcpy_power7.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,4 +653,4 @@ _GLOBAL(memcpy_power7)
653653
15: addi r1,r1,STACKFRAMESIZE
654654
ld r3,-STACKFRAMESIZE+STK_REG(R31)(r1)
655655
b exit_vmx_copy /* tail call optimise */
656-
#endif /* CONFiG_ALTIVEC */
656+
#endif /* CONFIG_ALTIVEC */

arch/powerpc/mm/mmu_decl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static inline void _tlbil_va(unsigned long address, unsigned int pid,
6767
{
6868
__tlbil_va(address, pid);
6969
}
70-
#endif /* CONIFG_8xx */
70+
#endif /* CONFIG_8xx */
7171

7272
#if defined(CONFIG_PPC_BOOK3E) || defined(CONFIG_PPC_47x)
7373
extern void _tlbivax_bcast(unsigned long address, unsigned int pid,

arch/powerpc/platforms/44x/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ config AKEBONO
220220
select USB_EHCI_HCD_PLATFORM if USB_EHCI_HCD
221221
select MMC_SDHCI
222222
select MMC_SDHCI_PLTFM
223-
select MMC_SDHCI_OF_476GTR
224223
select ATA
225224
select SATA_AHCI_PLATFORM
226225
help

drivers/clk/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ config COMMON_CLK_WM831X
2828
depends on MFD_WM831X
2929
---help---
3030
Supports the clocking subsystem of the WM831x/2x series of
31-
PMICs from Wolfson Microlectronics.
31+
PMICs from Wolfson Microelectronics.
3232

3333
source "drivers/clk/versatile/Kconfig"
3434

drivers/cpufreq/cpufreq-dt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ static int cpufreq_init(struct cpufreq_policy *policy)
197197

198198
ret = allocate_resources(policy->cpu, &cpu_dev, &cpu_reg, &cpu_clk);
199199
if (ret) {
200-
pr_err("%s: Failed to allocate resources\n: %d", __func__, ret);
200+
pr_err("%s: Failed to allocate resources: %d\n", __func__, ret);
201201
return ret;
202202
}
203203

drivers/gpio/gpio-msm-v1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ static int gpio_msm_v1_probe(struct platform_device *pdev)
686686
irq_set_chained_handler(irq1, msm_gpio_irq_handler);
687687
irq_set_chained_handler(irq2, msm_gpio_irq_handler);
688688
irq_set_irq_wake(irq1, 1);
689-
irq_set_irq_wake(irq2, 2);
689+
irq_set_irq_wake(irq2, 1);
690690
return 0;
691691
}
692692

drivers/gpio/gpio-spear-spics.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,5 +204,5 @@ static int __init spics_gpio_init(void)
204204
subsys_initcall(spics_gpio_init);
205205

206206
MODULE_AUTHOR("Shiraz Hashim <[email protected]>");
207-
MODULE_DESCRIPTION("ST Microlectronics SPEAr SPI Chip Select Abstraction");
207+
MODULE_DESCRIPTION("STMicroelectronics SPEAr SPI Chip Select Abstraction");
208208
MODULE_LICENSE("GPL");

drivers/gpu/drm/radeon/mkregtable.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ static inline void list_splice_tail_init(struct list_head *list,
347347
* list_entry - get the struct for this entry
348348
* @ptr: the &struct list_head pointer.
349349
* @type: the type of the struct this is embedded in.
350-
* @member: the name of the list_struct within the struct.
350+
* @member: the name of the list_head within the struct.
351351
*/
352352
#define list_entry(ptr, type, member) \
353353
container_of(ptr, type, member)
@@ -356,7 +356,7 @@ static inline void list_splice_tail_init(struct list_head *list,
356356
* list_first_entry - get the first element from a list
357357
* @ptr: the list head to take the element from.
358358
* @type: the type of the struct this is embedded in.
359-
* @member: the name of the list_struct within the struct.
359+
* @member: the name of the list_head within the struct.
360360
*
361361
* Note, that list is expected to be not empty.
362362
*/
@@ -406,7 +406,7 @@ static inline void list_splice_tail_init(struct list_head *list,
406406
* list_for_each_entry - iterate over list of given type
407407
* @pos: the type * to use as a loop cursor.
408408
* @head: the head for your list.
409-
* @member: the name of the list_struct within the struct.
409+
* @member: the name of the list_head within the struct.
410410
*/
411411
#define list_for_each_entry(pos, head, member) \
412412
for (pos = list_entry((head)->next, typeof(*pos), member); \
@@ -417,7 +417,7 @@ static inline void list_splice_tail_init(struct list_head *list,
417417
* list_for_each_entry_reverse - iterate backwards over list of given type.
418418
* @pos: the type * to use as a loop cursor.
419419
* @head: the head for your list.
420-
* @member: the name of the list_struct within the struct.
420+
* @member: the name of the list_head within the struct.
421421
*/
422422
#define list_for_each_entry_reverse(pos, head, member) \
423423
for (pos = list_entry((head)->prev, typeof(*pos), member); \
@@ -428,7 +428,7 @@ static inline void list_splice_tail_init(struct list_head *list,
428428
* list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
429429
* @pos: the type * to use as a start point
430430
* @head: the head of the list
431-
* @member: the name of the list_struct within the struct.
431+
* @member: the name of the list_head within the struct.
432432
*
433433
* Prepares a pos entry for use as a start point in list_for_each_entry_continue().
434434
*/
@@ -439,7 +439,7 @@ static inline void list_splice_tail_init(struct list_head *list,
439439
* list_for_each_entry_continue - continue iteration over list of given type
440440
* @pos: the type * to use as a loop cursor.
441441
* @head: the head for your list.
442-
* @member: the name of the list_struct within the struct.
442+
* @member: the name of the list_head within the struct.
443443
*
444444
* Continue to iterate over list of given type, continuing after
445445
* the current position.
@@ -453,7 +453,7 @@ static inline void list_splice_tail_init(struct list_head *list,
453453
* list_for_each_entry_continue_reverse - iterate backwards from the given point
454454
* @pos: the type * to use as a loop cursor.
455455
* @head: the head for your list.
456-
* @member: the name of the list_struct within the struct.
456+
* @member: the name of the list_head within the struct.
457457
*
458458
* Start to iterate over list of given type backwards, continuing after
459459
* the current position.
@@ -467,7 +467,7 @@ static inline void list_splice_tail_init(struct list_head *list,
467467
* list_for_each_entry_from - iterate over list of given type from the current point
468468
* @pos: the type * to use as a loop cursor.
469469
* @head: the head for your list.
470-
* @member: the name of the list_struct within the struct.
470+
* @member: the name of the list_head within the struct.
471471
*
472472
* Iterate over list of given type, continuing from current position.
473473
*/
@@ -480,7 +480,7 @@ static inline void list_splice_tail_init(struct list_head *list,
480480
* @pos: the type * to use as a loop cursor.
481481
* @n: another type * to use as temporary storage
482482
* @head: the head for your list.
483-
* @member: the name of the list_struct within the struct.
483+
* @member: the name of the list_head within the struct.
484484
*/
485485
#define list_for_each_entry_safe(pos, n, head, member) \
486486
for (pos = list_entry((head)->next, typeof(*pos), member), \
@@ -493,7 +493,7 @@ static inline void list_splice_tail_init(struct list_head *list,
493493
* @pos: the type * to use as a loop cursor.
494494
* @n: another type * to use as temporary storage
495495
* @head: the head for your list.
496-
* @member: the name of the list_struct within the struct.
496+
* @member: the name of the list_head within the struct.
497497
*
498498
* Iterate over list of given type, continuing after current point,
499499
* safe against removal of list entry.
@@ -509,7 +509,7 @@ static inline void list_splice_tail_init(struct list_head *list,
509509
* @pos: the type * to use as a loop cursor.
510510
* @n: another type * to use as temporary storage
511511
* @head: the head for your list.
512-
* @member: the name of the list_struct within the struct.
512+
* @member: the name of the list_head within the struct.
513513
*
514514
* Iterate over list of given type from current point, safe against
515515
* removal of list entry.
@@ -524,7 +524,7 @@ static inline void list_splice_tail_init(struct list_head *list,
524524
* @pos: the type * to use as a loop cursor.
525525
* @n: another type * to use as temporary storage
526526
* @head: the head for your list.
527-
* @member: the name of the list_struct within the struct.
527+
* @member: the name of the list_head within the struct.
528528
*
529529
* Iterate backwards over list of given type, safe against removal
530530
* of list entry.

drivers/isdn/mISDN/l1oip_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1334,7 +1334,7 @@ init_card(struct l1oip *hc, int pri, int bundle)
13341334
if (id[l1oip_cnt] == 0) {
13351335
printk(KERN_WARNING "Warning: No 'id' value given or "
13361336
"0, this is highly unsecure. Please use 32 "
1337-
"bit randmom number 0x...\n");
1337+
"bit random number 0x...\n");
13381338
}
13391339
hc->id = id[l1oip_cnt];
13401340
if (debug & DEBUG_L1OIP_INIT)

drivers/media/pci/cx18/cx18-driver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ struct cx18_options {
290290
* list_entry_is_past_end - check if a previous loop cursor is off list end
291291
* @pos: the type * previously used as a loop cursor.
292292
* @head: the head for your list.
293-
* @member: the name of the list_struct within the struct.
293+
* @member: the name of the list_head within the struct.
294294
*
295295
* Check if the entry's list_head is the head of the list, thus it's not a
296296
* real entry but was the loop cursor that walked past the end

drivers/media/pci/ttpci/budget-patch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
490490

491491
if(detected == 0)
492492
printk("budget-patch not detected or saa7146 in non-default state.\n"
493-
"try enabling ressetting of 7146 with MASK_31 in MC1 register\n");
493+
"try enabling resetting of 7146 with MASK_31 in MC1 register\n");
494494

495495
else
496496
printk("BUDGET-PATCH DETECTED.\n");

drivers/net/ethernet/atheros/atl1c/atl1c_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ MODULE_DEVICE_TABLE(pci, atl1c_pci_tbl);
4848

4949
MODULE_AUTHOR("Jie Yang");
5050
MODULE_AUTHOR("Qualcomm Atheros Inc., <[email protected]>");
51-
MODULE_DESCRIPTION("Qualcom Atheros 100/1000M Ethernet Network Driver");
51+
MODULE_DESCRIPTION("Qualcomm Atheros 100/1000M Ethernet Network Driver");
5252
MODULE_LICENSE("GPL");
5353
MODULE_VERSION(ATL1C_DRV_VERSION);
5454

drivers/pinctrl/spear/pinctrl-plgpio.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,5 +724,5 @@ static int __init plgpio_init(void)
724724
subsys_initcall(plgpio_init);
725725

726726
MODULE_AUTHOR("Viresh Kumar <[email protected]>");
727-
MODULE_DESCRIPTION("ST Microlectronics SPEAr PLGPIO driver");
727+
MODULE_DESCRIPTION("STMicroelectronics SPEAr PLGPIO driver");
728728
MODULE_LICENSE("GPL");

drivers/platform/x86/intel_ips.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ static void ips_disable_gpu_turbo(struct ips_driver *ips)
593593
return;
594594

595595
if (!ips->gpu_turbo_disable())
596-
dev_err(&ips->dev->dev, "failed to disable graphis turbo\n");
596+
dev_err(&ips->dev->dev, "failed to disable graphics turbo\n");
597597
else
598598
ips->__gpu_turbo_on = false;
599599
}

drivers/s390/char/tape_3590.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,7 @@ tape_3590_print_io_sim_msg_f1(struct tape_device *device, struct irb *irb)
10901090
"channel path 0x%x on CU",
10911091
sense->fmt.f71.md[1]);
10921092
else
1093-
snprintf(service, BUFSIZE, "Repair will disable cannel"
1093+
snprintf(service, BUFSIZE, "Repair will disable channel"
10941094
" paths (0x%x-0x%x) on CU",
10951095
sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
10961096
break;
@@ -1481,7 +1481,7 @@ tape_3590_irq(struct tape_device *device, struct tape_request *request,
14811481
}
14821482

14831483
if (irb->scsw.cmd.dstat & DEV_STAT_CHN_END) {
1484-
DBF_EVENT(2, "cannel end\n");
1484+
DBF_EVENT(2, "channel end\n");
14851485
return TAPE_IO_PENDING;
14861486
}
14871487

drivers/scsi/isci/task.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ int isci_task_abort_task(struct sas_task *task)
588588

589589
ret = TMF_RESP_FUNC_COMPLETE;
590590
} else {
591-
/* Fill in the tmf stucture */
591+
/* Fill in the tmf structure */
592592
isci_task_build_abort_task_tmf(&tmf, isci_tmf_ssp_task_abort,
593593
old_request);
594594

drivers/scsi/mac_scsi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ static void mac_scsi_reset_boot(struct Scsi_Host *instance)
166166
XXX: Since bus errors in the PDMA routines never happen on my
167167
computer, the bus error code is untested.
168168
If the code works as intended, a bus error results in Pseudo-DMA
169-
beeing disabled, meaning that the driver switches to slow handshake.
169+
being disabled, meaning that the driver switches to slow handshake.
170170
If bus errors are NOT extremely rare, this has to be changed.
171171
*/
172172

drivers/scsi/megaraid/megaraid_sas_base.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6783,7 +6783,7 @@ static int __init megasas_init(void)
67836783
rval = pci_register_driver(&megasas_pci_driver);
67846784

67856785
if (rval) {
6786-
printk(KERN_DEBUG "megasas: PCI hotplug regisration failed \n");
6786+
printk(KERN_DEBUG "megasas: PCI hotplug registration failed \n");
67876787
goto err_pcidrv;
67886788
}
67896789

drivers/scsi/mpt2sas/mpt2sas_ctl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ struct mpt2_ioctl_eventreport {
224224
};
225225

226226
/**
227-
* struct mpt2_ioctl_command - generic mpt firmware passthru ioclt
227+
* struct mpt2_ioctl_command - generic mpt firmware passthru ioctl
228228
* @hdr - generic header
229229
* @timeout - command timeout in seconds. (if zero then use driver default
230230
* value).

drivers/scsi/ps3rom.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@ static int ps3rom_probe(struct ps3_system_bus_device *_dev)
383383
if (!host) {
384384
dev_err(&dev->sbd.core, "%s:%u: scsi_host_alloc failed\n",
385385
__func__, __LINE__);
386+
error = -ENOMEM;
386387
goto fail_teardown;
387388
}
388389

0 commit comments

Comments
 (0)