aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/busses/i2c-stu300.c2
-rw-r--r--drivers/misc/fsa9480.c2
-rw-r--r--drivers/misc/mei/nfc.c2
-rw-r--r--drivers/net/wan/lmc/lmc_main.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_nx2.c2
-rw-r--r--drivers/scsi/qla4xxx/ql4_83xx.c2
-rw-r--r--drivers/tty/serial/crisv10.c2
-rw-r--r--drivers/usb/serial/kobil_sct.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
index 04a17b9b38bb..5b80ef310841 100644
--- a/drivers/i2c/busses/i2c-stu300.c
+++ b/drivers/i2c/busses/i2c-stu300.c
@@ -801,7 +801,7 @@ static int stu300_xfer_msg(struct i2c_adapter *adap,
801 /* Check that the bus is free, or wait until some timeout occurs */ 801 /* Check that the bus is free, or wait until some timeout occurs */
802 ret = stu300_wait_while_busy(dev); 802 ret = stu300_wait_while_busy(dev);
803 if (ret != 0) { 803 if (ret != 0) {
804 dev_err(&dev->pdev->dev, "timout waiting for transfer " 804 dev_err(&dev->pdev->dev, "timeout waiting for transfer "
805 "to commence.\n"); 805 "to commence.\n");
806 goto exit_disable; 806 goto exit_disable;
807 } 807 }
diff --git a/drivers/misc/fsa9480.c b/drivers/misc/fsa9480.c
index a725c79c35f5..71d2793b372c 100644
--- a/drivers/misc/fsa9480.c
+++ b/drivers/misc/fsa9480.c
@@ -396,7 +396,7 @@ static int fsa9480_irq_init(struct fsa9480_usbsw *usbsw)
396 IRQF_TRIGGER_FALLING | IRQF_ONESHOT, 396 IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
397 "fsa9480 micro USB", usbsw); 397 "fsa9480 micro USB", usbsw);
398 if (ret) { 398 if (ret) {
399 dev_err(&client->dev, "failed to reqeust IRQ\n"); 399 dev_err(&client->dev, "failed to request IRQ\n");
400 return ret; 400 return ret;
401 } 401 }
402 402
diff --git a/drivers/misc/mei/nfc.c b/drivers/misc/mei/nfc.c
index 994ca4aff1a3..04087d1369d9 100644
--- a/drivers/misc/mei/nfc.c
+++ b/drivers/misc/mei/nfc.c
@@ -428,7 +428,7 @@ static void mei_nfc_init(struct work_struct *work)
428 mutex_unlock(&dev->device_lock); 428 mutex_unlock(&dev->device_lock);
429 429
430 if (mei_nfc_if_version(ndev) < 0) { 430 if (mei_nfc_if_version(ndev) < 0) {
431 dev_err(&dev->pdev->dev, "Could not get the NFC interfave version"); 431 dev_err(&dev->pdev->dev, "Could not get the NFC interface version");
432 432
433 goto err; 433 goto err;
434 } 434 }
diff --git a/drivers/net/wan/lmc/lmc_main.c b/drivers/net/wan/lmc/lmc_main.c
index 7ef435bab425..f51204cfe12f 100644
--- a/drivers/net/wan/lmc/lmc_main.c
+++ b/drivers/net/wan/lmc/lmc_main.c
@@ -2126,7 +2126,7 @@ bug_out:
2126 2126
2127 spin_unlock_irqrestore(&sc->lmc_lock, flags); 2127 spin_unlock_irqrestore(&sc->lmc_lock, flags);
2128 2128
2129 lmc_trace(dev, "lmc_driver_timout out"); 2129 lmc_trace(dev, "lmc_driver_timeout out");
2130 2130
2131 2131
2132} 2132}
diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c
index 8164cc9e7286..4f5d66b2168b 100644
--- a/drivers/scsi/qla2xxx/qla_nx2.c
+++ b/drivers/scsi/qla2xxx/qla_nx2.c
@@ -2253,7 +2253,7 @@ qla8044_minidump_process_rdmem(struct scsi_qla_host *vha,
2253 2253
2254 if (r_addr & 0xf) { 2254 if (r_addr & 0xf) {
2255 ql_dbg(ql_dbg_p3p, vha, 0xb0f1, 2255 ql_dbg(ql_dbg_p3p, vha, 0xb0f1,
2256 "[%s]: Read addr 0x%x not 16 bytes alligned\n", 2256 "[%s]: Read addr 0x%x not 16 bytes aligned\n",
2257 __func__, r_addr); 2257 __func__, r_addr);
2258 return QLA_FUNCTION_FAILED; 2258 return QLA_FUNCTION_FAILED;
2259 } 2259 }
diff --git a/drivers/scsi/qla4xxx/ql4_83xx.c b/drivers/scsi/qla4xxx/ql4_83xx.c
index 8196c2f7915c..919284834ad7 100644
--- a/drivers/scsi/qla4xxx/ql4_83xx.c
+++ b/drivers/scsi/qla4xxx/ql4_83xx.c
@@ -465,7 +465,7 @@ int qla4_83xx_drv_lock(struct scsi_qla_host *ha)
465 } 465 }
466 /* Recovery Failed, some other function 466 /* Recovery Failed, some other function
467 * has the lock, wait for 2secs and retry */ 467 * has the lock, wait for 2secs and retry */
468 ql4_printk(KERN_INFO, ha, "%s: IDC lock Recovery by %d failed, Retrying timout\n", 468 ql4_printk(KERN_INFO, ha, "%s: IDC lock Recovery by %d failed, Retrying timeout\n",
469 __func__, ha->func_num); 469 __func__, ha->func_num);
470 timeout = 0; 470 timeout = 0;
471 } 471 }
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index 477f22f773fc..690bdea0a0c1 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -2153,7 +2153,7 @@ static void flush_timeout_function(unsigned long data)
2153 2153
2154 fast_timers[info->line].function = NULL; 2154 fast_timers[info->line].function = NULL;
2155 serial_fast_timer_expired++; 2155 serial_fast_timer_expired++;
2156 TIMERD(DEBUG_LOG(info->line, "flush_timout %i ", info->line)); 2156 TIMERD(DEBUG_LOG(info->line, "flush_timeout %i ", info->line));
2157 TIMERD(DEBUG_LOG(info->line, "num expired: %i\n", serial_fast_timer_expired)); 2157 TIMERD(DEBUG_LOG(info->line, "num expired: %i\n", serial_fast_timer_expired));
2158 check_flush_timeout(info); 2158 check_flush_timeout(info);
2159} 2159}
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c
index 78b48c31abf5..4c94ffcb66cd 100644
--- a/drivers/usb/serial/kobil_sct.c
+++ b/drivers/usb/serial/kobil_sct.c
@@ -194,7 +194,7 @@ static int kobil_open(struct tty_struct *tty, struct usb_serial_port *port)
194 KOBIL_TIMEOUT 194 KOBIL_TIMEOUT
195 ); 195 );
196 dev_dbg(dev, "%s - Send get_HW_version URB returns: %i\n", __func__, result); 196 dev_dbg(dev, "%s - Send get_HW_version URB returns: %i\n", __func__, result);
197 dev_dbg(dev, "Harware version: %i.%i.%i\n", transfer_buffer[0], 197 dev_dbg(dev, "Hardware version: %i.%i.%i\n", transfer_buffer[0],
198 transfer_buffer[1], transfer_buffer[2]); 198 transfer_buffer[1], transfer_buffer[2]);
199 199
200 /* get firmware version */ 200 /* get firmware version */