aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/cavium-octeon/setup.c4
-rw-r--r--arch/mips/pci/pci-octeon.c2
-rw-r--r--arch/powerpc/kvm/e500_mmu_host.c6
-rw-r--r--drivers/isdn/mISDN/l1oip_core.c2
-rw-r--r--drivers/media/pci/ttpci/budget-patch.c2
-rw-r--r--drivers/s390/char/tape_3590.c4
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_base.c2
-rw-r--r--drivers/target/target_core_xcopy.c2
-rw-r--r--drivers/tty/serial/Kconfig2
-rw-r--r--drivers/usb/gadget/function/f_hid.c2
-rw-r--r--drivers/usb/host/ehci-sysfs.c2
-rw-r--r--drivers/usb/host/fotg210-hcd.c2
-rw-r--r--drivers/usb/host/fusbh200-hcd.c2
-rw-r--r--fs/reiserfs/journal.c2
-rw-r--r--tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c2
15 files changed, 19 insertions, 19 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 5ebdb32d9a2b..94f888d3384e 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -1092,7 +1092,7 @@ static int __init edac_devinit(void)
1092 name = edac_device_names[i]; 1092 name = edac_device_names[i];
1093 dev = platform_device_register_simple(name, -1, NULL, 0); 1093 dev = platform_device_register_simple(name, -1, NULL, 0);
1094 if (IS_ERR(dev)) { 1094 if (IS_ERR(dev)) {
1095 pr_err("Registation of %s failed!\n", name); 1095 pr_err("Registration of %s failed!\n", name);
1096 err = PTR_ERR(dev); 1096 err = PTR_ERR(dev);
1097 } 1097 }
1098 } 1098 }
@@ -1103,7 +1103,7 @@ static int __init edac_devinit(void)
1103 dev = platform_device_register_simple("octeon_lmc_edac", 1103 dev = platform_device_register_simple("octeon_lmc_edac",
1104 i, NULL, 0); 1104 i, NULL, 0);
1105 if (IS_ERR(dev)) { 1105 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);
1107 err = PTR_ERR(dev); 1107 err = PTR_ERR(dev);
1108 } 1108 }
1109 } 1109 }
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
index 59cccd95688b..d07e04121cc6 100644
--- a/arch/mips/pci/pci-octeon.c
+++ b/arch/mips/pci/pci-octeon.c
@@ -708,7 +708,7 @@ static int __init octeon_pci_setup(void)
708 708
709 if (IS_ERR(platform_device_register_simple("octeon_pci_edac", 709 if (IS_ERR(platform_device_register_simple("octeon_pci_edac",
710 -1, NULL, 0))) 710 -1, NULL, 0)))
711 pr_err("Registation of co_pci_edac failed!\n"); 711 pr_err("Registration of co_pci_edac failed!\n");
712 712
713 octeon_pci_dma_init(); 713 octeon_pci_dma_init();
714 714
diff --git a/arch/powerpc/kvm/e500_mmu_host.c b/arch/powerpc/kvm/e500_mmu_host.c
index 769778f855b0..cc536d4a75ef 100644
--- a/arch/powerpc/kvm/e500_mmu_host.c
+++ b/arch/powerpc/kvm/e500_mmu_host.c
@@ -661,7 +661,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
661 if (unlikely((pr && !(mas3 & MAS3_UX)) || 661 if (unlikely((pr && !(mas3 & MAS3_UX)) ||
662 (!pr && !(mas3 & MAS3_SX)))) { 662 (!pr && !(mas3 & MAS3_SX)))) {
663 pr_err_ratelimited( 663 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",
665 __func__, geaddr); 665 __func__, geaddr);
666 return EMULATE_AGAIN; 666 return EMULATE_AGAIN;
667 } 667 }
@@ -673,7 +673,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
673 if (has_feature(vcpu, VCPU_FTR_MMU_V2) && 673 if (has_feature(vcpu, VCPU_FTR_MMU_V2) &&
674 unlikely((mas2 & MAS2_I) || (mas2 & MAS2_W) || !(mas2 & MAS2_M))) { 674 unlikely((mas2 & MAS2_I) || (mas2 & MAS2_W) || !(mas2 & MAS2_M))) {
675 pr_err_ratelimited( 675 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",
677 __func__, geaddr); 677 __func__, geaddr);
678 return EMULATE_AGAIN; 678 return EMULATE_AGAIN;
679 } 679 }
@@ -686,7 +686,7 @@ int kvmppc_load_last_inst(struct kvm_vcpu *vcpu, enum instruction_type type,
686 686
687 /* Guard against emulation from devices area */ 687 /* Guard against emulation from devices area */
688 if (unlikely(!page_is_ram(pfn))) { 688 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",
690 __func__, addr); 690 __func__, addr);
691 return EMULATE_AGAIN; 691 return EMULATE_AGAIN;
692 } 692 }
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c
index 9f454d76cc06..67c21876c35f 100644
--- a/drivers/isdn/mISDN/l1oip_core.c
+++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -1334,7 +1334,7 @@ init_card(struct l1oip *hc, int pri, int bundle)
1334 if (id[l1oip_cnt] == 0) { 1334 if (id[l1oip_cnt] == 0) {
1335 printk(KERN_WARNING "Warning: No 'id' value given or " 1335 printk(KERN_WARNING "Warning: No 'id' value given or "
1336 "0, this is highly unsecure. Please use 32 " 1336 "0, this is highly unsecure. Please use 32 "
1337 "bit randmom number 0x...\n"); 1337 "bit random number 0x...\n");
1338 } 1338 }
1339 hc->id = id[l1oip_cnt]; 1339 hc->id = id[l1oip_cnt];
1340 if (debug & DEBUG_L1OIP_INIT) 1340 if (debug & DEBUG_L1OIP_INIT)
diff --git a/drivers/media/pci/ttpci/budget-patch.c b/drivers/media/pci/ttpci/budget-patch.c
index 2cb35c23d2ac..a4d8867e1d7b 100644
--- a/drivers/media/pci/ttpci/budget-patch.c
+++ b/drivers/media/pci/ttpci/budget-patch.c
@@ -490,7 +490,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
490 490
491 if(detected == 0) 491 if(detected == 0)
492 printk("budget-patch not detected or saa7146 in non-default state.\n" 492 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");
494 494
495 else 495 else
496 printk("BUDGET-PATCH DETECTED.\n"); 496 printk("BUDGET-PATCH DETECTED.\n");
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 327cb19ad0b0..d3d1936057b4 100644
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -1090,7 +1090,7 @@ tape_3590_print_io_sim_msg_f1(struct tape_device *device, struct irb *irb)
1090 "channel path 0x%x on CU", 1090 "channel path 0x%x on CU",
1091 sense->fmt.f71.md[1]); 1091 sense->fmt.f71.md[1]);
1092 else 1092 else
1093 snprintf(service, BUFSIZE, "Repair will disable cannel" 1093 snprintf(service, BUFSIZE, "Repair will disable channel"
1094 " paths (0x%x-0x%x) on CU", 1094 " paths (0x%x-0x%x) on CU",
1095 sense->fmt.f71.md[1], sense->fmt.f71.md[2]); 1095 sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
1096 break; 1096 break;
@@ -1481,7 +1481,7 @@ tape_3590_irq(struct tape_device *device, struct tape_request *request,
1481 } 1481 }
1482 1482
1483 if (irb->scsw.cmd.dstat & DEV_STAT_CHN_END) { 1483 if (irb->scsw.cmd.dstat & DEV_STAT_CHN_END) {
1484 DBF_EVENT(2, "cannel end\n"); 1484 DBF_EVENT(2, "channel end\n");
1485 return TAPE_IO_PENDING; 1485 return TAPE_IO_PENDING;
1486 } 1486 }
1487 1487
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index 5640ad1c8214..6edef43969d1 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)
6740 rval = pci_register_driver(&megasas_pci_driver); 6740 rval = pci_register_driver(&megasas_pci_driver);
6741 6741
6742 if (rval) { 6742 if (rval) {
6743 printk(KERN_DEBUG "megasas: PCI hotplug regisration failed \n"); 6743 printk(KERN_DEBUG "megasas: PCI hotplug registration failed \n");
6744 goto err_pcidrv; 6744 goto err_pcidrv;
6745 } 6745 }
6746 6746
diff --git a/drivers/target/target_core_xcopy.c b/drivers/target/target_core_xcopy.c
index e9186cdf35e9..33ac39bf75e5 100644
--- a/drivers/target/target_core_xcopy.c
+++ b/drivers/target/target_core_xcopy.c
@@ -335,7 +335,7 @@ static int target_xcopy_parse_segment_descriptors(struct se_cmd *se_cmd,
335 desc += XCOPY_SEGMENT_DESC_LEN; 335 desc += XCOPY_SEGMENT_DESC_LEN;
336 break; 336 break;
337 default: 337 default:
338 pr_err("XCOPY unspported segment descriptor" 338 pr_err("XCOPY unsupported segment descriptor"
339 "type: 0x%02x\n", desc[0]); 339 "type: 0x%02x\n", desc[0]);
340 goto out; 340 goto out;
341 } 341 }
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 649b784081c7..f967d65c7d28 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -701,7 +701,7 @@ config PDC_CONSOLE
701 Saying Y here will enable the software based PDC console to be 701 Saying Y here will enable the software based PDC console to be
702 used as the system console. This is useful for machines in 702 used as the system console. This is useful for machines in
703 which the hardware based console has not been written yet. The 703 which the hardware based console has not been written yet. The
704 following steps must be competed to use the PDC console: 704 following steps must be completed to use the PDC console:
705 705
706 1. create the device entry (mknod /dev/ttyB0 c 11 0) 706 1. create the device entry (mknod /dev/ttyB0 c 11 0)
707 2. Edit the /etc/inittab to start a getty listening on /dev/ttyB0 707 2. Edit the /etc/inittab to start a getty listening on /dev/ttyB0
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c
index 59ab62c92b66..ea2b9c374305 100644
--- a/drivers/usb/gadget/function/f_hid.c
+++ b/drivers/usb/gadget/function/f_hid.c
@@ -396,7 +396,7 @@ static int hidg_setup(struct usb_function *f,
396 396
397 case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8 397 case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8
398 | HID_REQ_SET_REPORT): 398 | HID_REQ_SET_REPORT):
399 VDBG(cdev, "set_report | wLenght=%d\n", ctrl->wLength); 399 VDBG(cdev, "set_report | wLength=%d\n", ctrl->wLength);
400 goto stall; 400 goto stall;
401 break; 401 break;
402 402
diff --git a/drivers/usb/host/ehci-sysfs.c b/drivers/usb/host/ehci-sysfs.c
index f6459dfb6f54..5e44407aa099 100644
--- a/drivers/usb/host/ehci-sysfs.c
+++ b/drivers/usb/host/ehci-sysfs.c
@@ -132,7 +132,7 @@ static ssize_t store_uframe_periodic_max(struct device *dev,
132 132
133 if (allocated_max > uframe_periodic_max) { 133 if (allocated_max > uframe_periodic_max) {
134 ehci_info(ehci, 134 ehci_info(ehci,
135 "cannot decrease uframe_periodic_max becase " 135 "cannot decrease uframe_periodic_max because "
136 "periodic bandwidth is already allocated " 136 "periodic bandwidth is already allocated "
137 "(%u > %u)\n", 137 "(%u > %u)\n",
138 allocated_max, uframe_periodic_max); 138 allocated_max, uframe_periodic_max);
diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c
index 3de1278677d0..ecf02b2623e8 100644
--- a/drivers/usb/host/fotg210-hcd.c
+++ b/drivers/usb/host/fotg210-hcd.c
@@ -4958,7 +4958,7 @@ static ssize_t store_uframe_periodic_max(struct device *dev,
4958 4958
4959 if (allocated_max > uframe_periodic_max) { 4959 if (allocated_max > uframe_periodic_max) {
4960 fotg210_info(fotg210, 4960 fotg210_info(fotg210,
4961 "cannot decrease uframe_periodic_max becase " 4961 "cannot decrease uframe_periodic_max because "
4962 "periodic bandwidth is already allocated " 4962 "periodic bandwidth is already allocated "
4963 "(%u > %u)\n", 4963 "(%u > %u)\n",
4964 allocated_max, uframe_periodic_max); 4964 allocated_max, uframe_periodic_max);
diff --git a/drivers/usb/host/fusbh200-hcd.c b/drivers/usb/host/fusbh200-hcd.c
index abe42f31559f..664d2aa1239c 100644
--- a/drivers/usb/host/fusbh200-hcd.c
+++ b/drivers/usb/host/fusbh200-hcd.c
@@ -4893,7 +4893,7 @@ static ssize_t store_uframe_periodic_max(struct device *dev,
4893 4893
4894 if (allocated_max > uframe_periodic_max) { 4894 if (allocated_max > uframe_periodic_max) {
4895 fusbh200_info(fusbh200, 4895 fusbh200_info(fusbh200,
4896 "cannot decrease uframe_periodic_max becase " 4896 "cannot decrease uframe_periodic_max because "
4897 "periodic bandwidth is already allocated " 4897 "periodic bandwidth is already allocated "
4898 "(%u > %u)\n", 4898 "(%u > %u)\n",
4899 allocated_max, uframe_periodic_max); 4899 allocated_max, uframe_periodic_max);
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index d571e173a990..9d6486d416a3 100644
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -2772,7 +2772,7 @@ int journal_init(struct super_block *sb, const char *j_dev_name,
2772 2772
2773 if (journal_init_dev(sb, journal, j_dev_name) != 0) { 2773 if (journal_init_dev(sb, journal, j_dev_name) != 0) {
2774 reiserfs_warning(sb, "sh-462", 2774 reiserfs_warning(sb, "sh-462",
2775 "unable to initialize jornal device"); 2775 "unable to initialize journal device");
2776 goto free_and_return; 2776 goto free_and_return;
2777 } 2777 }
2778 2778
diff --git a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c
index af4b0508be77..aaca1f44e788 100644
--- a/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c
+++ b/tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c
@@ -342,7 +342,7 @@ int main(int argc, char *argv[])
342 iobuf[i].requested = ret; 342 iobuf[i].requested = ret;
343 printf("submit: %d requests buf: %d\n", ret, i); 343 printf("submit: %d requests buf: %d\n", ret, i);
344 } else 344 } else
345 perror("unable to submit reqests"); 345 perror("unable to submit requests");
346 } 346 }
347 347
348 /* if event is ready to read */ 348 /* if event is ready to read */