diff options
-rw-r--r-- | arch/arm/mach-imx/mach-pca100.c | 2 | ||||
-rw-r--r-- | arch/arm64/kvm/handle_exit.c | 2 | ||||
-rw-r--r-- | arch/mips/ralink/cevt-rt3352.c | 2 | ||||
-rw-r--r-- | arch/mips/ralink/timer.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 2 | ||||
-rw-r--r-- | drivers/char/msm_smd_pkt.c | 2 | ||||
-rw-r--r-- | drivers/devfreq/exynos/exynos5_bus.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_fimc.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_drm_gsc.c | 4 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-exynos5.c | 2 | ||||
-rw-r--r-- | drivers/iio/adc/twl6030-gpadc.c | 2 | ||||
-rw-r--r-- | drivers/isdn/hisax/hfc4s8s_l1.c | 2 | ||||
-rw-r--r-- | drivers/media/platform/ti-vpe/vpdma.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/libertas/cmdresp.c | 2 | ||||
-rw-r--r-- | drivers/video/udlfb.c | 2 | ||||
-rw-r--r-- | fs/btrfs/tests/free-space-tests.c | 2 | ||||
-rw-r--r-- | net/nfc/digital_dep.c | 2 |
17 files changed, 19 insertions, 19 deletions
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index c5f95674e9b7..bf3ac51d5aca 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c | |||
@@ -249,7 +249,7 @@ static int pca100_sdhc2_init(struct device *dev, irq_handler_t detect_irq, | |||
249 | "imx-mmc-detect", data); | 249 | "imx-mmc-detect", data); |
250 | if (ret) | 250 | if (ret) |
251 | printk(KERN_ERR | 251 | printk(KERN_ERR |
252 | "pca100: Failed to reuest irq for sd/mmc detection\n"); | 252 | "pca100: Failed to request irq for sd/mmc detection\n"); |
253 | 253 | ||
254 | return ret; | 254 | return ret; |
255 | } | 255 | } |
diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 8da56067c304..42a0f1bddfe7 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c | |||
@@ -90,7 +90,7 @@ static exit_handle_fn kvm_get_exit_handler(struct kvm_vcpu *vcpu) | |||
90 | 90 | ||
91 | if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers) || | 91 | if (hsr_ec >= ARRAY_SIZE(arm_exit_handlers) || |
92 | !arm_exit_handlers[hsr_ec]) { | 92 | !arm_exit_handlers[hsr_ec]) { |
93 | kvm_err("Unkown exception class: hsr: %#08x\n", | 93 | kvm_err("Unknown exception class: hsr: %#08x\n", |
94 | (unsigned int)kvm_vcpu_get_hsr(vcpu)); | 94 | (unsigned int)kvm_vcpu_get_hsr(vcpu)); |
95 | BUG(); | 95 | BUG(); |
96 | } | 96 | } |
diff --git a/arch/mips/ralink/cevt-rt3352.c b/arch/mips/ralink/cevt-rt3352.c index cc17566d1934..24bf057a3613 100644 --- a/arch/mips/ralink/cevt-rt3352.c +++ b/arch/mips/ralink/cevt-rt3352.c | |||
@@ -138,7 +138,7 @@ static void __init ralink_systick_init(struct device_node *np) | |||
138 | 138 | ||
139 | clockevents_register_device(&systick.dev); | 139 | clockevents_register_device(&systick.dev); |
140 | 140 | ||
141 | pr_info("%s: runing - mult: %d, shift: %d\n", | 141 | pr_info("%s: running - mult: %d, shift: %d\n", |
142 | np->name, systick.dev.mult, systick.dev.shift); | 142 | np->name, systick.dev.mult, systick.dev.shift); |
143 | } | 143 | } |
144 | 144 | ||
diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c index 202785709441..e38692a44e69 100644 --- a/arch/mips/ralink/timer.c +++ b/arch/mips/ralink/timer.c | |||
@@ -147,7 +147,7 @@ static int rt_timer_probe(struct platform_device *pdev) | |||
147 | rt_timer_config(rt, 2); | 147 | rt_timer_config(rt, 2); |
148 | rt_timer_enable(rt); | 148 | rt_timer_enable(rt); |
149 | 149 | ||
150 | dev_info(&pdev->dev, "maximum frequncy is %luHz\n", rt->timer_freq); | 150 | dev_info(&pdev->dev, "maximum frequency is %luHz\n", rt->timer_freq); |
151 | 151 | ||
152 | return 0; | 152 | return 0; |
153 | } | 153 | } |
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c index be7b1aa4d54c..37f7a89c10f2 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | |||
@@ -245,7 +245,7 @@ static irqreturn_t mpc52xx_lpbfifo_irq(int irq, void *dev_id) | |||
245 | 245 | ||
246 | if (dma && !write) { | 246 | if (dma && !write) { |
247 | spin_unlock_irqrestore(&lpbfifo.lock, flags); | 247 | spin_unlock_irqrestore(&lpbfifo.lock, flags); |
248 | pr_err("bogus LPBFIFO IRQ (dma and not writting)\n"); | 248 | pr_err("bogus LPBFIFO IRQ (dma and not writing)\n"); |
249 | return IRQ_HANDLED; | 249 | return IRQ_HANDLED; |
250 | } | 250 | } |
251 | 251 | ||
diff --git a/drivers/char/msm_smd_pkt.c b/drivers/char/msm_smd_pkt.c index 8eca55deb3a3..ba82a06d9684 100644 --- a/drivers/char/msm_smd_pkt.c +++ b/drivers/char/msm_smd_pkt.c | |||
@@ -182,7 +182,7 @@ static int smd_pkt_write(struct file *file, const char __user *buf, | |||
182 | if (count > MAX_BUF_SIZE) | 182 | if (count > MAX_BUF_SIZE) |
183 | return -EINVAL; | 183 | return -EINVAL; |
184 | 184 | ||
185 | DBG("writting %d bytes\n", count); | 185 | DBG("writing %d bytes\n", count); |
186 | 186 | ||
187 | smd_pkt_devp = file->private_data; | 187 | smd_pkt_devp = file->private_data; |
188 | if (!smd_pkt_devp || !smd_pkt_devp->ch) | 188 | if (!smd_pkt_devp || !smd_pkt_devp->ch) |
diff --git a/drivers/devfreq/exynos/exynos5_bus.c b/drivers/devfreq/exynos/exynos5_bus.c index a60da3c1c48e..6eef1f7397c6 100644 --- a/drivers/devfreq/exynos/exynos5_bus.c +++ b/drivers/devfreq/exynos/exynos5_bus.c | |||
@@ -152,7 +152,7 @@ static int exynos5_busfreq_int_target(struct device *dev, unsigned long *_freq, | |||
152 | if (old_freq == freq) | 152 | if (old_freq == freq) |
153 | return 0; | 153 | return 0; |
154 | 154 | ||
155 | dev_dbg(dev, "targetting %lukHz %luuV\n", freq, volt); | 155 | dev_dbg(dev, "targeting %lukHz %luuV\n", freq, volt); |
156 | 156 | ||
157 | mutex_lock(&data->lock); | 157 | mutex_lock(&data->lock); |
158 | 158 | ||
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimc.c b/drivers/gpu/drm/exynos/exynos_drm_fimc.c index 8adfc8f1e08f..30d76b2ff9c2 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fimc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fimc.c | |||
@@ -345,7 +345,7 @@ static bool fimc_check_ovf(struct fimc_context *ctx) | |||
345 | 345 | ||
346 | fimc_write(cfg, EXYNOS_CIWDOFST); | 346 | fimc_write(cfg, EXYNOS_CIWDOFST); |
347 | 347 | ||
348 | dev_err(ippdrv->dev, "occured overflow at %d, status 0x%x.\n", | 348 | dev_err(ippdrv->dev, "occurred overflow at %d, status 0x%x.\n", |
349 | ctx->id, status); | 349 | ctx->id, status); |
350 | return true; | 350 | return true; |
351 | } | 351 | } |
diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c index cd6aebd53bd0..fa75059a6104 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c | |||
@@ -1301,13 +1301,13 @@ static irqreturn_t gsc_irq_handler(int irq, void *dev_id) | |||
1301 | 1301 | ||
1302 | status = gsc_read(GSC_IRQ); | 1302 | status = gsc_read(GSC_IRQ); |
1303 | if (status & GSC_IRQ_STATUS_OR_IRQ) { | 1303 | if (status & GSC_IRQ_STATUS_OR_IRQ) { |
1304 | dev_err(ippdrv->dev, "occured overflow at %d, status 0x%x.\n", | 1304 | dev_err(ippdrv->dev, "occurred overflow at %d, status 0x%x.\n", |
1305 | ctx->id, status); | 1305 | ctx->id, status); |
1306 | return IRQ_NONE; | 1306 | return IRQ_NONE; |
1307 | } | 1307 | } |
1308 | 1308 | ||
1309 | if (status & GSC_IRQ_STATUS_OR_FRM_DONE) { | 1309 | if (status & GSC_IRQ_STATUS_OR_FRM_DONE) { |
1310 | dev_dbg(ippdrv->dev, "occured frame done at %d, status 0x%x.\n", | 1310 | dev_dbg(ippdrv->dev, "occurred frame done at %d, status 0x%x.\n", |
1311 | ctx->id, status); | 1311 | ctx->id, status); |
1312 | 1312 | ||
1313 | buf_id[EXYNOS_DRM_OPS_SRC] = gsc_get_src_buf_index(ctx); | 1313 | buf_id[EXYNOS_DRM_OPS_SRC] = gsc_get_src_buf_index(ctx); |
diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c index c1ef228095b5..044f85b01d06 100644 --- a/drivers/i2c/busses/i2c-exynos5.c +++ b/drivers/i2c/busses/i2c-exynos5.c | |||
@@ -571,7 +571,7 @@ static int exynos5_i2c_xfer(struct i2c_adapter *adap, | |||
571 | int i = 0, ret = 0, stop = 0; | 571 | int i = 0, ret = 0, stop = 0; |
572 | 572 | ||
573 | if (i2c->suspended) { | 573 | if (i2c->suspended) { |
574 | dev_err(i2c->dev, "HS-I2C is not initialzed.\n"); | 574 | dev_err(i2c->dev, "HS-I2C is not initialized.\n"); |
575 | return -EIO; | 575 | return -EIO; |
576 | } | 576 | } |
577 | 577 | ||
diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c index 53e1c645cee7..53a24ebb92c3 100644 --- a/drivers/iio/adc/twl6030-gpadc.c +++ b/drivers/iio/adc/twl6030-gpadc.c | |||
@@ -969,7 +969,7 @@ static int twl6030_gpadc_suspend(struct device *pdev) | |||
969 | ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, TWL6030_GPADCR, | 969 | ret = twl_i2c_write_u8(TWL6030_MODULE_ID1, TWL6030_GPADCR, |
970 | TWL6030_REG_TOGGLE1); | 970 | TWL6030_REG_TOGGLE1); |
971 | if (ret) | 971 | if (ret) |
972 | dev_err(pdev, "error reseting GPADC (%d)!\n", ret); | 972 | dev_err(pdev, "error resetting GPADC (%d)!\n", ret); |
973 | 973 | ||
974 | return 0; | 974 | return 0; |
975 | }; | 975 | }; |
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c index c49c294fc81e..414dbf6da89a 100644 --- a/drivers/isdn/hisax/hfc4s8s_l1.c +++ b/drivers/isdn/hisax/hfc4s8s_l1.c | |||
@@ -1620,7 +1620,7 @@ hfc4s8s_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1620 | #else | 1620 | #else |
1621 | if (!request_region(hw->iobase, 8, hw->card_name)) { | 1621 | if (!request_region(hw->iobase, 8, hw->card_name)) { |
1622 | printk(KERN_INFO | 1622 | printk(KERN_INFO |
1623 | "HFC-4S/8S: failed to rquest address space at 0x%04x\n", | 1623 | "HFC-4S/8S: failed to request address space at 0x%04x\n", |
1624 | hw->iobase); | 1624 | hw->iobase); |
1625 | goto out; | 1625 | goto out; |
1626 | } | 1626 | } |
diff --git a/drivers/media/platform/ti-vpe/vpdma.c b/drivers/media/platform/ti-vpe/vpdma.c index af0a5ffcaa98..fcbe48a09cf8 100644 --- a/drivers/media/platform/ti-vpe/vpdma.c +++ b/drivers/media/platform/ti-vpe/vpdma.c | |||
@@ -577,8 +577,8 @@ static void dump_dtd(struct vpdma_dtd *dtd) | |||
577 | pr_debug("word5: max_width %d, max_height %d\n", | 577 | pr_debug("word5: max_width %d, max_height %d\n", |
578 | dtd_get_max_width(dtd), dtd_get_max_height(dtd)); | 578 | dtd_get_max_width(dtd), dtd_get_max_height(dtd)); |
579 | 579 | ||
580 | pr_debug("word6: client specfic attr0 = 0x%08x\n", dtd->client_attr0); | 580 | pr_debug("word6: client specific attr0 = 0x%08x\n", dtd->client_attr0); |
581 | pr_debug("word7: client specfic attr1 = 0x%08x\n", dtd->client_attr1); | 581 | pr_debug("word7: client specific attr1 = 0x%08x\n", dtd->client_attr1); |
582 | } | 582 | } |
583 | 583 | ||
584 | /* | 584 | /* |
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c index 178b222b3ce1..65f18f1e869c 100644 --- a/drivers/net/wireless/libertas/cmdresp.c +++ b/drivers/net/wireless/libertas/cmdresp.c | |||
@@ -248,7 +248,7 @@ int lbs_process_event(struct lbs_private *priv, u32 event) | |||
248 | /* handle unexpected PS SLEEP event */ | 248 | /* handle unexpected PS SLEEP event */ |
249 | if (priv->psstate == PS_STATE_FULL_POWER) { | 249 | if (priv->psstate == PS_STATE_FULL_POWER) { |
250 | lbs_deb_cmd( | 250 | lbs_deb_cmd( |
251 | "EVENT: in FULL POWER mode, ignoreing PS_SLEEP\n"); | 251 | "EVENT: in FULL POWER mode, ignoring PS_SLEEP\n"); |
252 | break; | 252 | break; |
253 | } | 253 | } |
254 | priv->psstate = PS_STATE_PRE_SLEEP; | 254 | priv->psstate = PS_STATE_PRE_SLEEP; |
diff --git a/drivers/video/udlfb.c b/drivers/video/udlfb.c index 025f14e30eed..77b890e4d296 100644 --- a/drivers/video/udlfb.c +++ b/drivers/video/udlfb.c | |||
@@ -1624,7 +1624,7 @@ static int dlfb_usb_probe(struct usb_interface *interface, | |||
1624 | } | 1624 | } |
1625 | 1625 | ||
1626 | if (pixel_limit) { | 1626 | if (pixel_limit) { |
1627 | pr_warn("DL chip limit of %d overriden" | 1627 | pr_warn("DL chip limit of %d overridden" |
1628 | " by module param to %d\n", | 1628 | " by module param to %d\n", |
1629 | dev->sku_pixel_limit, pixel_limit); | 1629 | dev->sku_pixel_limit, pixel_limit); |
1630 | dev->sku_pixel_limit = pixel_limit; | 1630 | dev->sku_pixel_limit = pixel_limit; |
diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c index 6fc82010dc15..790f118c3277 100644 --- a/fs/btrfs/tests/free-space-tests.c +++ b/fs/btrfs/tests/free-space-tests.c | |||
@@ -101,7 +101,7 @@ static int test_extents(struct btrfs_block_group_cache *cache) | |||
101 | 101 | ||
102 | ret = btrfs_remove_free_space(cache, 2 * 1024 * 1024, 4096); | 102 | ret = btrfs_remove_free_space(cache, 2 * 1024 * 1024, 4096); |
103 | if (ret) { | 103 | if (ret) { |
104 | test_msg("Error removing middle peice %d\n", ret); | 104 | test_msg("Error removing middle piece %d\n", ret); |
105 | return ret; | 105 | return ret; |
106 | } | 106 | } |
107 | 107 | ||
diff --git a/net/nfc/digital_dep.c b/net/nfc/digital_dep.c index 07bbc24fb4c7..8b362e802d2f 100644 --- a/net/nfc/digital_dep.c +++ b/net/nfc/digital_dep.c | |||
@@ -563,7 +563,7 @@ static void digital_tg_recv_psl_req(struct nfc_digital_dev *ddev, void *arg, | |||
563 | rf_tech = NFC_DIGITAL_RF_TECH_424F; | 563 | rf_tech = NFC_DIGITAL_RF_TECH_424F; |
564 | break; | 564 | break; |
565 | default: | 565 | default: |
566 | pr_err("Unsuported dsi value %d\n", dsi); | 566 | pr_err("Unsupported dsi value %d\n", dsi); |
567 | goto exit; | 567 | goto exit; |
568 | } | 568 | } |
569 | 569 | ||