diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/i915/intel_bios.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 2 | ||||
-rw-r--r-- | drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c | 2 | ||||
-rw-r--r-- | drivers/net/bonding/bond_sysfs_slave.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/libertas_tf/main.c | 2 | ||||
-rw-r--r-- | drivers/scsi/aic7xxx/Kconfig.aic79xx | 2 | ||||
-rw-r--r-- | drivers/scsi/nsp32.c | 2 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla2xxx/qla_nx2.c | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c index 827498e081df..21b347efcf1e 100644 --- a/drivers/gpu/drm/i915/intel_bios.c +++ b/drivers/gpu/drm/i915/intel_bios.c | |||
@@ -945,7 +945,7 @@ static void parse_ddi_port(struct drm_i915_private *dev_priv, enum port port, | |||
945 | DRM_DEBUG_KMS("Analog port %c is also DP or TMDS compatible\n", | 945 | DRM_DEBUG_KMS("Analog port %c is also DP or TMDS compatible\n", |
946 | port_name(port)); | 946 | port_name(port)); |
947 | if (is_dvi && (port == PORT_A || port == PORT_E)) | 947 | if (is_dvi && (port == PORT_A || port == PORT_E)) |
948 | DRM_DEBUG_KMS("Port %c is TMDS compabile\n", port_name(port)); | 948 | DRM_DEBUG_KMS("Port %c is TMDS compatible\n", port_name(port)); |
949 | if (!is_dvi && !is_dp && !is_crt) | 949 | if (!is_dvi && !is_dp && !is_crt) |
950 | DRM_DEBUG_KMS("Port %c is not DP/TMDS/CRT compatible\n", | 950 | DRM_DEBUG_KMS("Port %c is not DP/TMDS/CRT compatible\n", |
951 | port_name(port)); | 951 | port_name(port)); |
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index e828a1dba0e5..24e2370d52a1 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
@@ -244,7 +244,7 @@ static bool is_ack(struct s3c24xx_i2c *i2c) | |||
244 | } | 244 | } |
245 | usleep_range(1000, 2000); | 245 | usleep_range(1000, 2000); |
246 | } | 246 | } |
247 | dev_err(i2c->dev, "ack was not recieved\n"); | 247 | dev_err(i2c->dev, "ack was not received\n"); |
248 | return false; | 248 | return false; |
249 | } | 249 | } |
250 | 250 | ||
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c index f8dfd76be89f..db3588df3546 100644 --- a/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c +++ b/drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | |||
@@ -511,7 +511,7 @@ int usnic_ib_qp_grp_modify(struct usnic_ib_qp_grp *qp_grp, | |||
511 | usnic_ib_qp_grp_state_to_string(old_state), | 511 | usnic_ib_qp_grp_state_to_string(old_state), |
512 | usnic_ib_qp_grp_state_to_string(new_state)); | 512 | usnic_ib_qp_grp_state_to_string(new_state)); |
513 | } else { | 513 | } else { |
514 | usnic_err("Failed to transistion %u from %s to %s", | 514 | usnic_err("Failed to transition %u from %s to %s", |
515 | qp_grp->grp_id, | 515 | qp_grp->grp_id, |
516 | usnic_ib_qp_grp_state_to_string(old_state), | 516 | usnic_ib_qp_grp_state_to_string(old_state), |
517 | usnic_ib_qp_grp_state_to_string(new_state)); | 517 | usnic_ib_qp_grp_state_to_string(new_state)); |
diff --git a/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c b/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c index e60cbb3aa609..f86cec091bf4 100644 --- a/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c +++ b/drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c | |||
@@ -259,7 +259,7 @@ static int vv6410_set_exposure(struct gspca_dev *gspca_dev, __s32 val) | |||
259 | fine = val % VV6410_CIF_LINELENGTH; | 259 | fine = val % VV6410_CIF_LINELENGTH; |
260 | coarse = min(512, val / VV6410_CIF_LINELENGTH); | 260 | coarse = min(512, val / VV6410_CIF_LINELENGTH); |
261 | 261 | ||
262 | PDEBUG(D_CONF, "Set coarse exposure to %d, fine expsure to %d", | 262 | PDEBUG(D_CONF, "Set coarse exposure to %d, fine exposure to %d", |
263 | coarse, fine); | 263 | coarse, fine); |
264 | 264 | ||
265 | err = stv06xx_write_sensor(sd, VV6410_FINEH, fine >> 8); | 265 | err = stv06xx_write_sensor(sd, VV6410_FINEH, fine >> 8); |
diff --git a/drivers/net/bonding/bond_sysfs_slave.c b/drivers/net/bonding/bond_sysfs_slave.c index 5cd532ca1cfe..b01b0ce4d1be 100644 --- a/drivers/net/bonding/bond_sysfs_slave.c +++ b/drivers/net/bonding/bond_sysfs_slave.c | |||
@@ -36,7 +36,7 @@ static ssize_t state_show(struct slave *slave, char *buf) | |||
36 | case BOND_STATE_BACKUP: | 36 | case BOND_STATE_BACKUP: |
37 | return sprintf(buf, "backup\n"); | 37 | return sprintf(buf, "backup\n"); |
38 | default: | 38 | default: |
39 | return sprintf(buf, "UNKONWN\n"); | 39 | return sprintf(buf, "UNKNOWN\n"); |
40 | } | 40 | } |
41 | } | 41 | } |
42 | static SLAVE_ATTR_RO(state); | 42 | static SLAVE_ATTR_RO(state); |
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c index db4280ce9c09..716fc37ada5a 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | |||
@@ -922,7 +922,7 @@ int netxen_config_ipaddr(struct netxen_adapter *adapter, __be32 ip, int cmd) | |||
922 | 922 | ||
923 | rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); | 923 | rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); |
924 | if (rv != 0) { | 924 | if (rv != 0) { |
925 | printk(KERN_ERR "%s: could not notify %s IP 0x%x reuqest\n", | 925 | printk(KERN_ERR "%s: could not notify %s IP 0x%x request\n", |
926 | adapter->netdev->name, | 926 | adapter->netdev->name, |
927 | (cmd == NX_IP_UP) ? "Add" : "Remove", ip); | 927 | (cmd == NX_IP_UP) ? "Add" : "Remove", ip); |
928 | } | 928 | } |
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c index 851cb4a80d50..03cd4c3d7835 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | |||
@@ -941,7 +941,7 @@ void qlcnic_82xx_config_ipaddr(struct qlcnic_adapter *adapter, | |||
941 | rv = qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); | 941 | rv = qlcnic_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1); |
942 | if (rv != 0) | 942 | if (rv != 0) |
943 | dev_err(&adapter->netdev->dev, | 943 | dev_err(&adapter->netdev->dev, |
944 | "could not notify %s IP 0x%x reuqest\n", | 944 | "could not notify %s IP 0x%x request\n", |
945 | (cmd == QLCNIC_IP_UP) ? "Add" : "Remove", ip); | 945 | (cmd == QLCNIC_IP_UP) ? "Add" : "Remove", ip); |
946 | } | 946 | } |
947 | 947 | ||
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c index 088de9d25c39..25c5acc78bd1 100644 --- a/drivers/net/wireless/libertas_tf/main.c +++ b/drivers/net/wireless/libertas_tf/main.c | |||
@@ -332,7 +332,7 @@ static int lbtf_op_start(struct ieee80211_hw *hw) | |||
332 | 332 | ||
333 | err_prog_firmware: | 333 | err_prog_firmware: |
334 | priv->hw_reset_device(card); | 334 | priv->hw_reset_device(card); |
335 | lbtf_deb_leave_args(LBTF_DEB_MACOPS, "error programing fw; ret=%d", ret); | 335 | lbtf_deb_leave_args(LBTF_DEB_MACOPS, "error programming fw; ret=%d", ret); |
336 | return ret; | 336 | return ret; |
337 | } | 337 | } |
338 | 338 | ||
diff --git a/drivers/scsi/aic7xxx/Kconfig.aic79xx b/drivers/scsi/aic7xxx/Kconfig.aic79xx index 6739069477de..3b3d599103f8 100644 --- a/drivers/scsi/aic7xxx/Kconfig.aic79xx +++ b/drivers/scsi/aic7xxx/Kconfig.aic79xx | |||
@@ -70,7 +70,7 @@ config AIC79XX_DEBUG_MASK | |||
70 | default "0" | 70 | default "0" |
71 | help | 71 | help |
72 | Bit mask of debug options that is only valid if the | 72 | Bit mask of debug options that is only valid if the |
73 | CONFIG_AIC79XX_DEBUG_ENBLE option is enabled. The bits in this mask | 73 | CONFIG_AIC79XX_DEBUG_ENABLE option is enabled. The bits in this mask |
74 | are defined in the drivers/scsi/aic7xxx/aic79xx.h - search for the | 74 | are defined in the drivers/scsi/aic7xxx/aic79xx.h - search for the |
75 | variable ahd_debug in that file to find them. | 75 | variable ahd_debug in that file to find them. |
76 | 76 | ||
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c index 50b086aef178..53284eb23a15 100644 --- a/drivers/scsi/nsp32.c +++ b/drivers/scsi/nsp32.c | |||
@@ -930,7 +930,7 @@ static int nsp32_queuecommand_lck(struct scsi_cmnd *SCpnt, void (*done)(struct s | |||
930 | 930 | ||
931 | /* check target ID is not same as this initiator ID */ | 931 | /* check target ID is not same as this initiator ID */ |
932 | if (scmd_id(SCpnt) == SCpnt->device->host->this_id) { | 932 | if (scmd_id(SCpnt) == SCpnt->device->host->this_id) { |
933 | nsp32_dbg(NSP32_DEBUG_QUEUECOMMAND, "terget==host???"); | 933 | nsp32_dbg(NSP32_DEBUG_QUEUECOMMAND, "target==host???"); |
934 | SCpnt->result = DID_BAD_TARGET << 16; | 934 | SCpnt->result = DID_BAD_TARGET << 16; |
935 | done(SCpnt); | 935 | done(SCpnt); |
936 | return 0; | 936 | return 0; |
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index 340ceff03823..34aad32829f5 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c | |||
@@ -533,7 +533,7 @@ static int nsp_negate_signal(struct scsi_cmnd *SCpnt, unsigned char mask, | |||
533 | } while ((--time_out != 0) && (reg & mask) != 0); | 533 | } while ((--time_out != 0) && (reg & mask) != 0); |
534 | 534 | ||
535 | if (time_out == 0) { | 535 | if (time_out == 0) { |
536 | nsp_msg(KERN_DEBUG, " %s signal off timeut", str); | 536 | nsp_msg(KERN_DEBUG, " %s signal off timeout", str); |
537 | } | 537 | } |
538 | 538 | ||
539 | return 0; | 539 | return 0; |
diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c index da9e3902f219..24a852828b5d 100644 --- a/drivers/scsi/qla2xxx/qla_nx2.c +++ b/drivers/scsi/qla2xxx/qla_nx2.c | |||
@@ -399,7 +399,7 @@ qla8044_idc_lock(struct qla_hw_data *ha) | |||
399 | */ | 399 | */ |
400 | ql_dbg(ql_dbg_p3p, vha, 0xb08a, | 400 | ql_dbg(ql_dbg_p3p, vha, 0xb08a, |
401 | "%s: IDC lock Recovery by %d " | 401 | "%s: IDC lock Recovery by %d " |
402 | "failed, Retrying timout\n", __func__, | 402 | "failed, Retrying timeout\n", __func__, |
403 | ha->portnum); | 403 | ha->portnum); |
404 | timeout = 0; | 404 | timeout = 0; |
405 | } | 405 | } |