mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -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
|
|
@ -228,7 +228,6 @@ static int pm860x_backlight_probe(struct platform_device *pdev)
|
|||
data->port = pdata->flags;
|
||||
if (data->port < 0) {
|
||||
dev_err(&pdev->dev, "wrong platform data is assigned");
|
||||
kfree(data);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -461,7 +461,7 @@ static int exynos_mipi_dsi_probe(struct platform_device *pdev)
|
|||
done:
|
||||
platform_set_drvdata(pdev, dsim);
|
||||
|
||||
dev_dbg(&pdev->dev, "%s() completed sucessfuly (%s mode)\n", __func__,
|
||||
dev_dbg(&pdev->dev, "%s() completed successfully (%s mode)\n", __func__,
|
||||
dsim_config->e_interface == DSIM_COMMAND ? "CPU" : "RGB");
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -694,6 +694,10 @@ static int __devinit tmiofb_probe(struct platform_device *dev)
|
|||
dev_err(&dev->dev, "NULL platform data!\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
if (ccr == NULL || lcr == NULL || vram == NULL || irq < 0) {
|
||||
dev_err(&dev->dev, "missing resources\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
info = framebuffer_alloc(sizeof(struct tmiofb_par), &dev->dev);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue