aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/m68k/Kconfig.devices2
-rw-r--r--arch/mips/lantiq/falcon/sysctrl.c2
-rw-r--r--arch/mips/lantiq/xway/sysctrl.c2
-rw-r--r--arch/mips/pci/pci-lantiq.c2
-rw-r--r--arch/powerpc/platforms/powernv/opal.c2
-rw-r--r--drivers/crypto/qat/qat_common/adf_ctl_drv.c2
-rw-r--r--drivers/infiniband/hw/ocrdma/ocrdma_verbs.c2
-rw-r--r--drivers/net/ethernet/mellanox/mlx4/cmd.c4
-rw-r--r--drivers/net/ethernet/via/via-velocity.c2
-rw-r--r--drivers/net/wireless/libertas/cfg.c2
-rw-r--r--drivers/scsi/fnic/fnic_debugfs.c2
-rw-r--r--drivers/scsi/fnic/fnic_trace.c2
-rw-r--r--drivers/video/backlight/88pm860x_bl.c2
-rw-r--r--net/netfilter/ipset/ip_set_core.c2
-rwxr-xr-xscripts/sign-file2
15 files changed, 16 insertions, 16 deletions
diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices
index d163991c5717..2a74777667fd 100644
--- a/arch/m68k/Kconfig.devices
+++ b/arch/m68k/Kconfig.devices
@@ -73,7 +73,7 @@ config ATARI_ETHERNEC
73 ROM port. The driver works by polling instead of interrupts, so it 73 ROM port. The driver works by polling instead of interrupts, so it
74 is quite slow. 74 is quite slow.
75 75
76 This driver also suppports the ethernet part of the NetUSBee ROM 76 This driver also supports the ethernet part of the NetUSBee ROM
77 port combined Ethernet/USB adapter. 77 port combined Ethernet/USB adapter.
78 78
79 To compile the actual ethernet driver, choose Y or M in for the NE2000 79 To compile the actual ethernet driver, choose Y or M in for the NE2000
diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sysctrl.c
index 8f1866d8124d..468ffa043607 100644
--- a/arch/mips/lantiq/falcon/sysctrl.c
+++ b/arch/mips/lantiq/falcon/sysctrl.c
@@ -221,7 +221,7 @@ void __init ltq_soc_init(void)
221 (request_mem_region(res_sys[2].start, 221 (request_mem_region(res_sys[2].start,
222 resource_size(&res_sys[2]), 222 resource_size(&res_sys[2]),
223 res_sys[2].name) < 0)) 223 res_sys[2].name) < 0))
224 pr_err("Failed to request core reources"); 224 pr_err("Failed to request core resources");
225 225
226 status_membase = ioremap_nocache(res_status.start, 226 status_membase = ioremap_nocache(res_status.start,
227 resource_size(&res_status)); 227 resource_size(&res_status));
diff --git a/arch/mips/lantiq/xway/sysctrl.c b/arch/mips/lantiq/xway/sysctrl.c
index 51804b10a036..2b15491de494 100644
--- a/arch/mips/lantiq/xway/sysctrl.c
+++ b/arch/mips/lantiq/xway/sysctrl.c
@@ -318,7 +318,7 @@ void __init ltq_soc_init(void)
318 res_cgu.name) < 0) || 318 res_cgu.name) < 0) ||
319 (request_mem_region(res_ebu.start, resource_size(&res_ebu), 319 (request_mem_region(res_ebu.start, resource_size(&res_ebu),
320 res_ebu.name) < 0)) 320 res_ebu.name) < 0))
321 pr_err("Failed to request core reources"); 321 pr_err("Failed to request core resources");
322 322
323 pmu_membase = ioremap_nocache(res_pmu.start, resource_size(&res_pmu)); 323 pmu_membase = ioremap_nocache(res_pmu.start, resource_size(&res_pmu));
324 ltq_cgu_membase = ioremap_nocache(res_cgu.start, 324 ltq_cgu_membase = ioremap_nocache(res_cgu.start,
diff --git a/arch/mips/pci/pci-lantiq.c b/arch/mips/pci/pci-lantiq.c
index cb1ef9984069..37fe8e7887e2 100644
--- a/arch/mips/pci/pci-lantiq.c
+++ b/arch/mips/pci/pci-lantiq.c
@@ -218,7 +218,7 @@ static int ltq_pci_probe(struct platform_device *pdev)
218 res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0); 218 res_cfg = platform_get_resource(pdev, IORESOURCE_MEM, 0);
219 res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1); 219 res_bridge = platform_get_resource(pdev, IORESOURCE_MEM, 1);
220 if (!res_cfg || !res_bridge) { 220 if (!res_cfg || !res_bridge) {
221 dev_err(&pdev->dev, "missing memory reources\n"); 221 dev_err(&pdev->dev, "missing memory resources\n");
222 return -EINVAL; 222 return -EINVAL;
223 } 223 }
224 224
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index 199975613fe9..aedc97417d71 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -324,7 +324,7 @@ static void opal_handle_message(void)
324 324
325 /* check for errors. */ 325 /* check for errors. */
326 if (ret) { 326 if (ret) {
327 pr_warning("%s: Failed to retrive opal message, err=%lld\n", 327 pr_warning("%s: Failed to retrieve opal message, err=%lld\n",
328 __func__, ret); 328 __func__, ret);
329 return; 329 return;
330 } 330 }
diff --git a/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
index d97069b8a8e4..6a92284a86b2 100644
--- a/drivers/crypto/qat/qat_common/adf_ctl_drv.c
+++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
@@ -436,7 +436,7 @@ static long adf_ctl_ioctl(struct file *fp, unsigned int cmd, unsigned long arg)
436 ret = adf_ctl_ioctl_get_status(fp, cmd, arg); 436 ret = adf_ctl_ioctl_get_status(fp, cmd, arg);
437 break; 437 break;
438 default: 438 default:
439 pr_err("QAT: Invalid ioclt\n"); 439 pr_err("QAT: Invalid ioctl\n");
440 ret = -EFAULT; 440 ret = -EFAULT;
441 break; 441 break;
442 } 442 }
diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index edf6211d84b8..8bae8718fa53 100644
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1859,7 +1859,7 @@ static int ocrdma_build_inline_sges(struct ocrdma_qp *qp,
1859 hdr->total_len = ocrdma_sglist_len(wr->sg_list, wr->num_sge); 1859 hdr->total_len = ocrdma_sglist_len(wr->sg_list, wr->num_sge);
1860 if (unlikely(hdr->total_len > qp->max_inline_data)) { 1860 if (unlikely(hdr->total_len > qp->max_inline_data)) {
1861 pr_err("%s() supported_len=0x%x,\n" 1861 pr_err("%s() supported_len=0x%x,\n"
1862 " unspported len req=0x%x\n", __func__, 1862 " unsupported len req=0x%x\n", __func__,
1863 qp->max_inline_data, hdr->total_len); 1863 qp->max_inline_data, hdr->total_len);
1864 return -EINVAL; 1864 return -EINVAL;
1865 } 1865 }
diff --git a/drivers/net/ethernet/mellanox/mlx4/cmd.c b/drivers/net/ethernet/mellanox/mlx4/cmd.c
index 5d940a26055c..fb0bf867f69f 100644
--- a/drivers/net/ethernet/mellanox/mlx4/cmd.c
+++ b/drivers/net/ethernet/mellanox/mlx4/cmd.c
@@ -1686,7 +1686,7 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave)
1686 if (err) { 1686 if (err) {
1687 vp_oper->vlan_idx = NO_INDX; 1687 vp_oper->vlan_idx = NO_INDX;
1688 mlx4_warn(&priv->dev, 1688 mlx4_warn(&priv->dev,
1689 "No vlan resorces slave %d, port %d\n", 1689 "No vlan resources slave %d, port %d\n",
1690 slave, port); 1690 slave, port);
1691 return err; 1691 return err;
1692 } 1692 }
@@ -1702,7 +1702,7 @@ static int mlx4_master_activate_admin_state(struct mlx4_priv *priv, int slave)
1702 err = vp_oper->mac_idx; 1702 err = vp_oper->mac_idx;
1703 vp_oper->mac_idx = NO_INDX; 1703 vp_oper->mac_idx = NO_INDX;
1704 mlx4_warn(&priv->dev, 1704 mlx4_warn(&priv->dev,
1705 "No mac resorces slave %d, port %d\n", 1705 "No mac resources slave %d, port %d\n",
1706 slave, port); 1706 slave, port);
1707 return err; 1707 return err;
1708 } 1708 }
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index de08e86db209..d5d547aef4f7 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -2056,7 +2056,7 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx)
2056 struct sk_buff *skb; 2056 struct sk_buff *skb;
2057 2057
2058 if (rd->rdesc0.RSR & (RSR_STP | RSR_EDP)) { 2058 if (rd->rdesc0.RSR & (RSR_STP | RSR_EDP)) {
2059 VELOCITY_PRT(MSG_LEVEL_VERBOSE, KERN_ERR " %s : the received frame span multple RDs.\n", vptr->netdev->name); 2059 VELOCITY_PRT(MSG_LEVEL_VERBOSE, KERN_ERR " %s : the received frame spans multiple RDs.\n", vptr->netdev->name);
2060 stats->rx_length_errors++; 2060 stats->rx_length_errors++;
2061 return -EINVAL; 2061 return -EINVAL;
2062 } 2062 }
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 47a998d8f99e..40ab7f0b7be0 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -1353,7 +1353,7 @@ static int lbs_cfg_connect(struct wiphy *wiphy, struct net_device *dev,
1353 wait_event_interruptible_timeout(priv->scan_q, 1353 wait_event_interruptible_timeout(priv->scan_q,
1354 (priv->scan_req == NULL), 1354 (priv->scan_req == NULL),
1355 (15 * HZ)); 1355 (15 * HZ));
1356 lbs_deb_assoc("assoc: scanning competed\n"); 1356 lbs_deb_assoc("assoc: scanning completed\n");
1357 } 1357 }
1358 1358
1359 /* Find the BSS we want using available scan results */ 1359 /* Find the BSS we want using available scan results */
diff --git a/drivers/scsi/fnic/fnic_debugfs.c b/drivers/scsi/fnic/fnic_debugfs.c
index 2c613bdea78f..5980c10c734d 100644
--- a/drivers/scsi/fnic/fnic_debugfs.c
+++ b/drivers/scsi/fnic/fnic_debugfs.c
@@ -210,7 +210,7 @@ static ssize_t fnic_trace_ctrl_write(struct file *filp,
210 else if (*trace_type == fc_trc_flag->fc_clear) 210 else if (*trace_type == fc_trc_flag->fc_clear)
211 fnic_fc_trace_cleared = val; 211 fnic_fc_trace_cleared = val;
212 else 212 else
213 pr_err("fnic: cannot write to any debufs file\n"); 213 pr_err("fnic: cannot write to any debugfs file\n");
214 214
215 (*ppos)++; 215 (*ppos)++;
216 216
diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c
index c77285926827..8b1b38751b49 100644
--- a/drivers/scsi/fnic/fnic_trace.c
+++ b/drivers/scsi/fnic/fnic_trace.c
@@ -592,7 +592,7 @@ int fnic_fc_trace_set_data(u32 host_no, u8 frame_type,
592 592
593 if (fnic_fc_trace_cleared == 1) { 593 if (fnic_fc_trace_cleared == 1) {
594 fc_trace_entries.rd_idx = fc_trace_entries.wr_idx = 0; 594 fc_trace_entries.rd_idx = fc_trace_entries.wr_idx = 0;
595 pr_info("fnic: Reseting the read idx\n"); 595 pr_info("fnic: Resetting the read idx\n");
596 memset((void *)fnic_fc_ctlr_trace_buf_p, 0, 596 memset((void *)fnic_fc_ctlr_trace_buf_p, 0,
597 fnic_fc_trace_max_pages * PAGE_SIZE); 597 fnic_fc_trace_max_pages * PAGE_SIZE);
598 fnic_fc_trace_cleared = 0; 598 fnic_fc_trace_cleared = 0;
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c
index 7db5234462d0..a6f7cc0a0883 100644
--- a/drivers/video/backlight/88pm860x_bl.c
+++ b/drivers/video/backlight/88pm860x_bl.c
@@ -216,7 +216,7 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
216 data->reg_duty_cycle = res->start; 216 data->reg_duty_cycle = res->start;
217 res = platform_get_resource_byname(pdev, IORESOURCE_REG, "always on"); 217 res = platform_get_resource_byname(pdev, IORESOURCE_REG, "always on");
218 if (!res) { 218 if (!res) {
219 dev_err(&pdev->dev, "No REG resorce for always on\n"); 219 dev_err(&pdev->dev, "No REG resource for always on\n");
220 return -ENXIO; 220 return -ENXIO;
221 } 221 }
222 data->reg_always_on = res->start; 222 data->reg_always_on = res->start;
diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
index ec8114fae50b..5edbbe829495 100644
--- a/net/netfilter/ipset/ip_set_core.c
+++ b/net/netfilter/ipset/ip_set_core.c
@@ -478,7 +478,7 @@ ip_set_test(ip_set_id_t index, const struct sk_buff *skb,
478 478
479 if (ret == -EAGAIN) { 479 if (ret == -EAGAIN) {
480 /* Type requests element to be completed */ 480 /* Type requests element to be completed */
481 pr_debug("element must be competed, ADD is triggered\n"); 481 pr_debug("element must be completed, ADD is triggered\n");
482 write_lock_bh(&set->lock); 482 write_lock_bh(&set->lock);
483 set->variant->kadt(set, skb, par, IPSET_ADD, opt); 483 set->variant->kadt(set, skb, par, IPSET_ADD, opt);
484 write_unlock_bh(&set->lock); 484 write_unlock_bh(&set->lock);
diff --git a/scripts/sign-file b/scripts/sign-file
index 2b7c4484d46c..3906ee1e2f76 100755
--- a/scripts/sign-file
+++ b/scripts/sign-file
@@ -398,7 +398,7 @@ if ($verbose) {
398 print "Size of signer's name : ", length($signers_name), "\n"; 398 print "Size of signer's name : ", length($signers_name), "\n";
399 print "Size of key identifier : ", length($key_identifier), "\n"; 399 print "Size of key identifier : ", length($key_identifier), "\n";
400 print "Size of signature : ", length($signature), "\n"; 400 print "Size of signature : ", length($signature), "\n";
401 print "Size of informaton : ", length($info), "\n"; 401 print "Size of information : ", length($info), "\n";
402 print "Size of magic number : ", length($magic_number), "\n"; 402 print "Size of magic number : ", length($magic_number), "\n";
403 print "Signer's name : '", $signers_name, "'\n"; 403 print "Signer's name : '", $signers_name, "'\n";
404 print "Digest : $dgst\n"; 404 print "Digest : $dgst\n";