mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull the trivial tree from Jiri Kosina: "Tiny usual fixes all over the place" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits) doc: fix old config name of kprobetrace fs/fs-writeback.c: cleanup riteback_sb_inodes kerneldoc btrfs: fix the commment for the action flags in delayed-ref.h btrfs: fix trivial typo for the comment of BTRFS_FREE_INO_OBJECTID vfs: fix kerneldoc for generic_fh_to_parent() treewide: fix comment/printk/variable typos ipr: fix small coding style issues doc: fix broken utf8 encoding nfs: comment fix platform/x86: fix asus_laptop.wled_type module parameter mfd: printk/comment fixes doc: getdelays.c: remember to close() socket on error in create_nl_socket() doc: aliasing-test: close fd on write error mmc: fix comment typos dma: fix comments spi: fix comment/printk typos in spi Coccinelle: fix typo in memdup_user.cocci tmiofb: missing NULL pointer checks tools: perf: Fix typo in tools/perf tools/testing: fix comment / output typos ...
This commit is contained in:
commit
99dbb1632f
87 changed files with 142 additions and 207 deletions
|
|
@ -342,7 +342,7 @@ int ab8500_gpadc_read_raw(struct ab8500_gpadc *gpadc, u8 channel)
|
|||
|
||||
/*
|
||||
* Delay might be needed for ABB8500 cut 3.0, if not, remove
|
||||
* when hardware will be availible
|
||||
* when hardware will be available
|
||||
*/
|
||||
msleep(1);
|
||||
break;
|
||||
|
|
|
|||
|
|
@ -281,7 +281,7 @@ static int __devinit rc5t583_i2c_probe(struct i2c_client *i2c,
|
|||
|
||||
if (i2c->irq) {
|
||||
ret = rc5t583_irq_init(rc5t583, i2c->irq, pdata->irq_base);
|
||||
/* Still continue with waring if irq init fails */
|
||||
/* Still continue with warning, if irq init fails */
|
||||
if (ret)
|
||||
dev_warn(&i2c->dev, "IRQ init failed: %d\n", ret);
|
||||
else
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* RDC321x MFD southbrige driver
|
||||
* RDC321x MFD southbridge driver
|
||||
*
|
||||
* Copyright (C) 2007-2010 Florian Fainelli <florian@openwrt.org>
|
||||
* Copyright (C) 2010 Bernhard Loos <bernhardloos@googlemail.com>
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ static __devinit int tps65911_comparator_probe(struct platform_device *pdev)
|
|||
|
||||
ret = comp_threshold_set(tps65910, COMP2, pdata->vmbch2_threshold);
|
||||
if (ret < 0) {
|
||||
dev_err(&pdev->dev, "cannot set COMP2 theshold\n");
|
||||
dev_err(&pdev->dev, "cannot set COMP2 threshold\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue