diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mfd/si476x-i2c.c | 2 | ||||
-rw-r--r-- | drivers/mmc/core/mmc.c | 4 | ||||
-rw-r--r-- | drivers/mmc/core/sd.c | 4 | ||||
-rw-r--r-- | drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 2 | ||||
-rw-r--r-- | drivers/net/phy/dp83640.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/airo.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/ath/wcn36xx/smd.c | 2 | ||||
-rw-r--r-- | drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 | ||||
-rw-r--r-- | drivers/scsi/ch.c | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/drivers/mfd/si476x-i2c.c b/drivers/mfd/si476x-i2c.c index 0e4a76daf187..7f87c62d91b3 100644 --- a/drivers/mfd/si476x-i2c.c +++ b/drivers/mfd/si476x-i2c.c | |||
@@ -766,7 +766,7 @@ static int si476x_core_probe(struct i2c_client *client, | |||
766 | sizeof(struct v4l2_rds_data), | 766 | sizeof(struct v4l2_rds_data), |
767 | GFP_KERNEL); | 767 | GFP_KERNEL); |
768 | if (rval) { | 768 | if (rval) { |
769 | dev_err(&client->dev, "Could not alloate the FIFO\n"); | 769 | dev_err(&client->dev, "Could not allocate the FIFO\n"); |
770 | goto free_gpio; | 770 | goto free_gpio; |
771 | } | 771 | } |
772 | mutex_init(&core->rds_drainer_status_lock); | 772 | mutex_init(&core->rds_drainer_status_lock); |
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index a301a78a2bd1..b212239750af 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c | |||
@@ -1816,7 +1816,7 @@ static int mmc_runtime_suspend(struct mmc_host *host) | |||
1816 | 1816 | ||
1817 | err = _mmc_suspend(host, true); | 1817 | err = _mmc_suspend(host, true); |
1818 | if (err) | 1818 | if (err) |
1819 | pr_err("%s: error %d doing aggessive suspend\n", | 1819 | pr_err("%s: error %d doing aggressive suspend\n", |
1820 | mmc_hostname(host), err); | 1820 | mmc_hostname(host), err); |
1821 | 1821 | ||
1822 | return err; | 1822 | return err; |
@@ -1834,7 +1834,7 @@ static int mmc_runtime_resume(struct mmc_host *host) | |||
1834 | 1834 | ||
1835 | err = _mmc_resume(host); | 1835 | err = _mmc_resume(host); |
1836 | if (err) | 1836 | if (err) |
1837 | pr_err("%s: error %d doing aggessive resume\n", | 1837 | pr_err("%s: error %d doing aggressive resume\n", |
1838 | mmc_hostname(host), err); | 1838 | mmc_hostname(host), err); |
1839 | 1839 | ||
1840 | return 0; | 1840 | return 0; |
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index d90a6de7901d..c2cddfd99c7c 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c | |||
@@ -1156,7 +1156,7 @@ static int mmc_sd_runtime_suspend(struct mmc_host *host) | |||
1156 | 1156 | ||
1157 | err = _mmc_sd_suspend(host); | 1157 | err = _mmc_sd_suspend(host); |
1158 | if (err) | 1158 | if (err) |
1159 | pr_err("%s: error %d doing aggessive suspend\n", | 1159 | pr_err("%s: error %d doing aggressive suspend\n", |
1160 | mmc_hostname(host), err); | 1160 | mmc_hostname(host), err); |
1161 | 1161 | ||
1162 | return err; | 1162 | return err; |
@@ -1174,7 +1174,7 @@ static int mmc_sd_runtime_resume(struct mmc_host *host) | |||
1174 | 1174 | ||
1175 | err = _mmc_sd_resume(host); | 1175 | err = _mmc_sd_resume(host); |
1176 | if (err) | 1176 | if (err) |
1177 | pr_err("%s: error %d doing aggessive resume\n", | 1177 | pr_err("%s: error %d doing aggressive resume\n", |
1178 | mmc_hostname(host), err); | 1178 | mmc_hostname(host), err); |
1179 | 1179 | ||
1180 | return 0; | 1180 | return 0; |
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c index 87e658ce23ef..2788af980086 100644 --- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c +++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c | |||
@@ -1105,7 +1105,7 @@ int gpmi_is_ready(struct gpmi_nand_data *this, unsigned chip) | |||
1105 | mask = MX28_BF_GPMI_STAT_READY_BUSY(1 << chip); | 1105 | mask = MX28_BF_GPMI_STAT_READY_BUSY(1 << chip); |
1106 | reg = readl(r->gpmi_regs + HW_GPMI_STAT); | 1106 | reg = readl(r->gpmi_regs + HW_GPMI_STAT); |
1107 | } else | 1107 | } else |
1108 | dev_err(this->dev, "unknow arch.\n"); | 1108 | dev_err(this->dev, "unknown arch.\n"); |
1109 | return reg & mask; | 1109 | return reg & mask; |
1110 | } | 1110 | } |
1111 | 1111 | ||
diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index e22e602beef3..4c2b5a80f17c 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c | |||
@@ -614,7 +614,7 @@ static void recalibrate(struct dp83640_clock *clock) | |||
614 | trigger = CAL_TRIGGER; | 614 | trigger = CAL_TRIGGER; |
615 | cal_gpio = 1 + ptp_find_pin(clock->ptp_clock, PTP_PF_PHYSYNC, 0); | 615 | cal_gpio = 1 + ptp_find_pin(clock->ptp_clock, PTP_PF_PHYSYNC, 0); |
616 | if (cal_gpio < 1) { | 616 | if (cal_gpio < 1) { |
617 | pr_err("PHY calibration pin not avaible - PHY is not calibrated."); | 617 | pr_err("PHY calibration pin not available - PHY is not calibrated."); |
618 | return; | 618 | return; |
619 | } | 619 | } |
620 | 620 | ||
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c index e71a2ce7a448..b97367d50717 100644 --- a/drivers/net/wireless/airo.c +++ b/drivers/net/wireless/airo.c | |||
@@ -3211,7 +3211,7 @@ static void airo_print_status(const char *devname, u16 status) | |||
3211 | airo_print_dbg(devname, "link lost (TSF sync lost)"); | 3211 | airo_print_dbg(devname, "link lost (TSF sync lost)"); |
3212 | break; | 3212 | break; |
3213 | default: | 3213 | default: |
3214 | airo_print_dbg(devname, "unknow status %x\n", status); | 3214 | airo_print_dbg(devname, "unknown status %x\n", status); |
3215 | break; | 3215 | break; |
3216 | } | 3216 | } |
3217 | break; | 3217 | break; |
@@ -3233,7 +3233,7 @@ static void airo_print_status(const char *devname, u16 status) | |||
3233 | case STAT_REASSOC: | 3233 | case STAT_REASSOC: |
3234 | break; | 3234 | break; |
3235 | default: | 3235 | default: |
3236 | airo_print_dbg(devname, "unknow status %x\n", status); | 3236 | airo_print_dbg(devname, "unknown status %x\n", status); |
3237 | break; | 3237 | break; |
3238 | } | 3238 | } |
3239 | } | 3239 | } |
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c index 63986931829e..3866b285b3ff 100644 --- a/drivers/net/wireless/ath/wcn36xx/smd.c +++ b/drivers/net/wireless/ath/wcn36xx/smd.c | |||
@@ -1632,7 +1632,7 @@ int wcn36xx_smd_keep_alive_req(struct wcn36xx *wcn, | |||
1632 | } else if (packet_type == WCN36XX_HAL_KEEP_ALIVE_UNSOLICIT_ARP_RSP) { | 1632 | } else if (packet_type == WCN36XX_HAL_KEEP_ALIVE_UNSOLICIT_ARP_RSP) { |
1633 | /* TODO: it also support ARP response type */ | 1633 | /* TODO: it also support ARP response type */ |
1634 | } else { | 1634 | } else { |
1635 | wcn36xx_warn("unknow keep alive packet type %d\n", packet_type); | 1635 | wcn36xx_warn("unknown keep alive packet type %d\n", packet_type); |
1636 | ret = -EINVAL; | 1636 | ret = -EINVAL; |
1637 | goto out; | 1637 | goto out; |
1638 | } | 1638 | } |
diff --git a/drivers/pinctrl/nomadik/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c index 228972827132..90a2c194027c 100644 --- a/drivers/pinctrl/nomadik/pinctrl-abx500.c +++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c | |||
@@ -466,7 +466,7 @@ static int abx500_set_mode(struct pinctrl_dev *pctldev, struct gpio_chip *chip, | |||
466 | break; | 466 | break; |
467 | 467 | ||
468 | default: | 468 | default: |
469 | dev_dbg(pct->dev, "unknow alt_setting %d\n", alt_setting); | 469 | dev_dbg(pct->dev, "unknown alt_setting %d\n", alt_setting); |
470 | 470 | ||
471 | return -EINVAL; | 471 | return -EINVAL; |
472 | } | 472 | } |
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c index ef5ae0d03616..9449f4aab78f 100644 --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c | |||
@@ -345,7 +345,7 @@ ch_readconfig(scsi_changer *ch) | |||
345 | ch->firsts[CHET_DT], | 345 | ch->firsts[CHET_DT], |
346 | ch->counts[CHET_DT]); | 346 | ch->counts[CHET_DT]); |
347 | } else { | 347 | } else { |
348 | VPRINTK(KERN_INFO, "reading element address assigment page failed!\n"); | 348 | VPRINTK(KERN_INFO, "reading element address assignment page failed!\n"); |
349 | } | 349 | } |
350 | 350 | ||
351 | /* vendor specific element types */ | 351 | /* vendor specific element types */ |