aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/gpu/drm/drm_fb_cma_helper.c4
-rw-r--r--drivers/gpu/drm/radeon/radeon_fb.c2
-rw-r--r--drivers/infiniband/ulp/isert/ib_isert.c2
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc_dec.c2
-rw-r--r--drivers/misc/dummy-irq.c2
-rw-r--r--drivers/misc/lattice-ecp3-config.c2
-rw-r--r--drivers/misc/mei/hbm.c2
-rw-r--r--drivers/misc/mei/init.c2
-rw-r--r--drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c2
-rw-r--r--drivers/nfc/pn533.c2
-rw-r--r--drivers/scsi/pm8001/pm80xx_hwi.c2
-rw-r--r--drivers/tty/serial/serial-tegra.c2
-rw-r--r--drivers/usb/musb/musb_dsps.c2
-rw-r--r--drivers/usb/musb/omap2430.c2
-rw-r--r--drivers/video/omap2/displays/panel-n8x0.c2
-rw-r--r--fs/btrfs/free-space-cache.c2
-rwxr-xr-xtools/testing/ktest/ktest.pl2
17 files changed, 18 insertions, 18 deletions
diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_fb_cma_helper.c
index 0b5af7d0edb1..c385cc5e730e 100644
--- a/drivers/gpu/drm/drm_fb_cma_helper.c
+++ b/drivers/gpu/drm/drm_fb_cma_helper.c
@@ -92,7 +92,7 @@ static struct drm_fb_cma *drm_fb_cma_alloc(struct drm_device *dev,
92 92
93 ret = drm_framebuffer_init(dev, &fb_cma->fb, &drm_fb_cma_funcs); 93 ret = drm_framebuffer_init(dev, &fb_cma->fb, &drm_fb_cma_funcs);
94 if (ret) { 94 if (ret) {
95 dev_err(dev->dev, "Failed to initalize framebuffer: %d\n", ret); 95 dev_err(dev->dev, "Failed to initialize framebuffer: %d\n", ret);
96 kfree(fb_cma); 96 kfree(fb_cma);
97 return ERR_PTR(ret); 97 return ERR_PTR(ret);
98 } 98 }
@@ -376,7 +376,7 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_device *dev,
376 376
377 ret = drm_fb_helper_initial_config(helper, preferred_bpp); 377 ret = drm_fb_helper_initial_config(helper, preferred_bpp);
378 if (ret < 0) { 378 if (ret < 0) {
379 dev_err(dev->dev, "Failed to set inital hw configuration.\n"); 379 dev_err(dev->dev, "Failed to set initial hw configuration.\n");
380 goto err_drm_fb_helper_fini; 380 goto err_drm_fb_helper_fini;
381 } 381 }
382 382
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c
index b1746741bc59..665ced3b7313 100644
--- a/drivers/gpu/drm/radeon/radeon_fb.c
+++ b/drivers/gpu/drm/radeon/radeon_fb.c
@@ -230,7 +230,7 @@ static int radeonfb_create(struct drm_fb_helper *helper,
230 230
231 ret = radeon_framebuffer_init(rdev->ddev, &rfbdev->rfb, &mode_cmd, gobj); 231 ret = radeon_framebuffer_init(rdev->ddev, &rfbdev->rfb, &mode_cmd, gobj);
232 if (ret) { 232 if (ret) {
233 DRM_ERROR("failed to initalise framebuffer %d\n", ret); 233 DRM_ERROR("failed to initialize framebuffer %d\n", ret);
234 goto out_unref; 234 goto out_unref;
235 } 235 }
236 236
diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 41712f096515..2693129055c1 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -1587,7 +1587,7 @@ isert_put_nopin(struct iscsi_cmd *cmd, struct iscsi_conn *conn,
1587 isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc); 1587 isert_init_tx_hdrs(isert_conn, &isert_cmd->tx_desc);
1588 isert_init_send_wr(isert_cmd, send_wr); 1588 isert_init_send_wr(isert_cmd, send_wr);
1589 1589
1590 pr_debug("Posting NOPIN Reponse IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n"); 1590 pr_debug("Posting NOPIN Response IB_WR_SEND >>>>>>>>>>>>>>>>>>>>>>\n");
1591 1591
1592 return isert_post_response(isert_conn, isert_cmd); 1592 return isert_post_response(isert_conn, isert_cmd);
1593} 1593}
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
index 4af53bd2f182..0fa1e9b38fc7 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -954,7 +954,7 @@ static int s5p_mfc_queue_setup(struct vb2_queue *vq,
954 psize[0] = ctx->dec_src_buf_size; 954 psize[0] = ctx->dec_src_buf_size;
955 allocators[0] = ctx->dev->alloc_ctx[MFC_BANK1_ALLOC_CTX]; 955 allocators[0] = ctx->dev->alloc_ctx[MFC_BANK1_ALLOC_CTX];
956 } else { 956 } else {
957 mfc_err("This video node is dedicated to decoding. Decoding not initalised\n"); 957 mfc_err("This video node is dedicated to decoding. Decoding not initialized\n");
958 return -EINVAL; 958 return -EINVAL;
959 } 959 }
960 return 0; 960 return 0;
diff --git a/drivers/misc/dummy-irq.c b/drivers/misc/dummy-irq.c
index c37eeedfe215..4d0db15df115 100644
--- a/drivers/misc/dummy-irq.c
+++ b/drivers/misc/dummy-irq.c
@@ -26,7 +26,7 @@ static irqreturn_t dummy_interrupt(int irq, void *dev_id)
26 static int count = 0; 26 static int count = 0;
27 27
28 if (count == 0) { 28 if (count == 0) {
29 printk(KERN_INFO "dummy-irq: interrupt occured on IRQ %d\n", 29 printk(KERN_INFO "dummy-irq: interrupt occurred on IRQ %d\n",
30 irq); 30 irq);
31 count++; 31 count++;
32 } 32 }
diff --git a/drivers/misc/lattice-ecp3-config.c b/drivers/misc/lattice-ecp3-config.c
index bb26f086bd8b..61fbe6acabef 100644
--- a/drivers/misc/lattice-ecp3-config.c
+++ b/drivers/misc/lattice-ecp3-config.c
@@ -170,7 +170,7 @@ static void firmware_load(const struct firmware *fw, void *context)
170 170
171 /* Check result */ 171 /* Check result */
172 if (status & FPGA_STATUS_DONE) 172 if (status & FPGA_STATUS_DONE)
173 dev_info(&spi->dev, "FPGA succesfully configured!\n"); 173 dev_info(&spi->dev, "FPGA successfully configured!\n");
174 else 174 else
175 dev_info(&spi->dev, "FPGA not configured (DONE not set)\n"); 175 dev_info(&spi->dev, "FPGA not configured (DONE not set)\n");
176 176
diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index 6916045166eb..54ffcbc24c70 100644
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -139,7 +139,7 @@ int mei_hbm_start_wait(struct mei_device *dev)
139 139
140 if (ret <= 0 && (dev->hbm_state <= MEI_HBM_START)) { 140 if (ret <= 0 && (dev->hbm_state <= MEI_HBM_START)) {
141 dev->hbm_state = MEI_HBM_IDLE; 141 dev->hbm_state = MEI_HBM_IDLE;
142 dev_err(&dev->pdev->dev, "wating for mei start failed\n"); 142 dev_err(&dev->pdev->dev, "waiting for mei start failed\n");
143 return -ETIMEDOUT; 143 return -ETIMEDOUT;
144 } 144 }
145 return 0; 145 return 0;
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 713d89fedc46..422d9c37dec9 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -38,7 +38,7 @@ const char *mei_dev_state_str(int state)
38 MEI_DEV_STATE(POWER_DOWN); 38 MEI_DEV_STATE(POWER_DOWN);
39 MEI_DEV_STATE(POWER_UP); 39 MEI_DEV_STATE(POWER_UP);
40 default: 40 default:
41 return "unkown"; 41 return "unknown";
42 } 42 }
43#undef MEI_DEV_STATE 43#undef MEI_DEV_STATE
44} 44}
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
index 196b2d100407..8b59a710a4a5 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
@@ -1675,7 +1675,7 @@ static int qlcnic_sriov_vf_handle_dev_ready(struct qlcnic_adapter *adapter)
1675 qlcnic_sriov_vf_attach(adapter); 1675 qlcnic_sriov_vf_attach(adapter);
1676 adapter->fw_fail_cnt = 0; 1676 adapter->fw_fail_cnt = 0;
1677 dev_info(dev, 1677 dev_info(dev,
1678 "%s: Reinitalization of VF 0x%x done after FW reset\n", 1678 "%s: Reinitialization of VF 0x%x done after FW reset\n",
1679 __func__, func); 1679 __func__, func);
1680 } else { 1680 } else {
1681 dev_err(dev, 1681 dev_err(dev,
diff --git a/drivers/nfc/pn533.c b/drivers/nfc/pn533.c
index 8f6f2baa930d..ec269e6f0375 100644
--- a/drivers/nfc/pn533.c
+++ b/drivers/nfc/pn533.c
@@ -1697,7 +1697,7 @@ static int pn533_poll_complete(struct pn533 *dev, void *arg,
1697 goto done; 1697 goto done;
1698 1698
1699 if (!dev->poll_mod_count) { 1699 if (!dev->poll_mod_count) {
1700 nfc_dev_dbg(&dev->interface->dev, "Polling has been stoped."); 1700 nfc_dev_dbg(&dev->interface->dev, "Polling has been stopped.");
1701 goto done; 1701 goto done;
1702 } 1702 }
1703 1703
diff --git a/drivers/scsi/pm8001/pm80xx_hwi.c b/drivers/scsi/pm8001/pm80xx_hwi.c
index 302514d8157b..1c5e7d233e78 100644
--- a/drivers/scsi/pm8001/pm80xx_hwi.c
+++ b/drivers/scsi/pm8001/pm80xx_hwi.c
@@ -3204,7 +3204,7 @@ static void process_one_iomb(struct pm8001_hba_info *pm8001_ha, void *piomb)
3204 break; 3204 break;
3205 case OPC_OUB_DEREG_DEV: 3205 case OPC_OUB_DEREG_DEV:
3206 PM8001_MSG_DBG(pm8001_ha, 3206 PM8001_MSG_DBG(pm8001_ha,
3207 pm8001_printk("unresgister the deviece\n")); 3207 pm8001_printk("unregister the device\n"));
3208 pm8001_mpi_dereg_resp(pm8001_ha, piomb); 3208 pm8001_mpi_dereg_resp(pm8001_ha, piomb);
3209 break; 3209 break;
3210 case OPC_OUB_GET_DEV_HANDLE: 3210 case OPC_OUB_GET_DEV_HANDLE:
diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c
index 9799d043a9bd..ee7c8123c374 100644
--- a/drivers/tty/serial/serial-tegra.c
+++ b/drivers/tty/serial/serial-tegra.c
@@ -1377,7 +1377,7 @@ static int __init tegra_uart_init(void)
1377 1377
1378 ret = platform_driver_register(&tegra_uart_platform_driver); 1378 ret = platform_driver_register(&tegra_uart_platform_driver);
1379 if (ret < 0) { 1379 if (ret < 0) {
1380 pr_err("Uart platfrom driver register failed, e = %d\n", ret); 1380 pr_err("Uart platform driver register failed, e = %d\n", ret);
1381 uart_unregister_driver(&tegra_uart_driver); 1381 uart_unregister_driver(&tegra_uart_driver);
1382 return ret; 1382 return ret;
1383 } 1383 }
diff --git a/drivers/usb/musb/musb_dsps.c b/drivers/usb/musb/musb_dsps.c
index e1b661d04021..5233804d66b1 100644
--- a/drivers/usb/musb/musb_dsps.c
+++ b/drivers/usb/musb/musb_dsps.c
@@ -551,7 +551,7 @@ static int dsps_create_musb_pdev(struct dsps_glue *glue, u8 id)
551 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); 551 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
552 if (!pdata) { 552 if (!pdata) {
553 dev_err(&pdev->dev, 553 dev_err(&pdev->dev,
554 "failed to allocate musb platfrom data\n"); 554 "failed to allocate musb platform data\n");
555 ret = -ENOMEM; 555 ret = -ENOMEM;
556 goto err2; 556 goto err2;
557 } 557 }
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 628b93fe5ccc..2325ef6bdeed 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -513,7 +513,7 @@ static int omap2430_probe(struct platform_device *pdev)
513 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); 513 pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
514 if (!pdata) { 514 if (!pdata) {
515 dev_err(&pdev->dev, 515 dev_err(&pdev->dev,
516 "failed to allocate musb platfrom data\n"); 516 "failed to allocate musb platform data\n");
517 goto err2; 517 goto err2;
518 } 518 }
519 519
diff --git a/drivers/video/omap2/displays/panel-n8x0.c b/drivers/video/omap2/displays/panel-n8x0.c
index f94ead6a3183..860b18014ad7 100644
--- a/drivers/video/omap2/displays/panel-n8x0.c
+++ b/drivers/video/omap2/displays/panel-n8x0.c
@@ -527,7 +527,7 @@ static int n8x0_panel_update(struct omap_dss_device *dssdev,
527 dh = dssdev->panel.timings.y_res; 527 dh = dssdev->panel.timings.y_res;
528 528
529 if (x != 0 || y != 0 || w != dw || h != dh) { 529 if (x != 0 || y != 0 || w != dw || h != dh) {
530 dev_err(&dssdev->dev, "invaid update region %d, %d, %d, %d\n", 530 dev_err(&dssdev->dev, "invalid update region %d, %d, %d, %d\n",
531 x, y, w, h); 531 x, y, w, h);
532 return -EINVAL; 532 return -EINVAL;
533 } 533 }
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index e53009657f0e..2750b5023526 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -3200,7 +3200,7 @@ static int test_extents(struct btrfs_block_group_cache *cache)
3200 3200
3201 ret = btrfs_remove_free_space(cache, 2 * 1024 * 1024, 4096); 3201 ret = btrfs_remove_free_space(cache, 2 * 1024 * 1024, 4096);
3202 if (ret) { 3202 if (ret) {
3203 printk(KERN_ERR "Error removing middle peice %d\n", ret); 3203 printk(KERN_ERR "Error removing middle piece %d\n", ret);
3204 return ret; 3204 return ret;
3205 } 3205 }
3206 3206
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 0d7fd8b51544..999eab1bc64f 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1796,7 +1796,7 @@ sub monitor {
1796 # We already booted into the kernel we are testing, 1796 # We already booted into the kernel we are testing,
1797 # but now we booted into another kernel? 1797 # but now we booted into another kernel?
1798 # Consider this a triple fault. 1798 # Consider this a triple fault.
1799 doprint "Aleady booted in Linux kernel $version, but now\n"; 1799 doprint "Already booted in Linux kernel $version, but now\n";
1800 doprint "we booted into Linux kernel $1.\n"; 1800 doprint "we booted into Linux kernel $1.\n";
1801 doprint "Assuming that this is a triple fault.\n"; 1801 doprint "Assuming that this is a triple fault.\n";
1802 doprint "To disable this: set DETECT_TRIPLE_FAULT to 0\n"; 1802 doprint "To disable this: set DETECT_TRIPLE_FAULT to 0\n";