Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina: "Usual rocket science stuff from trivial.git" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) neighbour.h: fix comment sched: Fix warning on make htmldocs caused by wait.h slab: struct kmem_cache is protected by slab_mutex doc: Fix typo in USB Gadget Documentation of/Kconfig: Spelling s/one/once/ mkregtable: Fix sscanf handling lp5523, lp8501: comment improvements thermal: rcar: comment spelling treewide: fix comments and printk msgs IXP4xx: remove '1 &&' from a condition check in ixp4xx_restart() Documentation: update /proc/uptime field description Documentation: Fix size parameter for snprintf arm: fix comment header and macro name asm-generic: uaccess: Spelling s/a ny/any/ mtd: onenand: fix comment header doc: driver-model/platform.txt: fix a typo drivers: fix typo in DEVTMPFS_MOUNT Kconfig help text doc: Fix typo (acces_process_vm -> access_process_vm) treewide: Fix typos in printk drivers/gpu/drm/qxl/Kconfig: reformat the help text ...
このコミットが含まれているのは:
@@ -571,7 +571,7 @@ static int exynos5_i2c_xfer(struct i2c_adapter *adap,
|
||||
int i = 0, ret = 0, stop = 0;
|
||||
|
||||
if (i2c->suspended) {
|
||||
dev_err(i2c->dev, "HS-I2C is not initialzed.\n");
|
||||
dev_err(i2c->dev, "HS-I2C is not initialized.\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
|
@@ -801,7 +801,7 @@ static int stu300_xfer_msg(struct i2c_adapter *adap,
|
||||
/* Check that the bus is free, or wait until some timeout occurs */
|
||||
ret = stu300_wait_while_busy(dev);
|
||||
if (ret != 0) {
|
||||
dev_err(&dev->pdev->dev, "timout waiting for transfer "
|
||||
dev_err(&dev->pdev->dev, "timeout waiting for transfer "
|
||||
"to commence.\n");
|
||||
goto exit_disable;
|
||||
}
|
||||
|
新しいイシューから参照
ユーザーをブロックする