A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Browse source 
Pull trivial tree updates from Jiri Kosina.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
  floppy: make local variable non-static
  exynos: fixes an incorrect header guard
  dt-bindings: fixes some incorrect header guards
  cpufreq-dt: correct dead link in documentation
  cpufreq: ARM big LITTLE: correct dead link in documentation
  treewide: Fix typos in printk
  Documentation: filesystem: Fix typo in fs/eventfd.c
  fs/super.c: use && instead of & for warn_on condition
  Documentation: fix sysfs-ptp
  lib: scatterlist: fix Kconfig description
This commit is contained in:
Linus Torvalds 2016-01-14 17:04:19 -08:00
commit 7d1fc01afc
22 changed files with 30 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/media/common/saa7146/saa7146_video.c
View file

@ -502,7 +502,7 @@ static int vidioc_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuf
/* check if overlay is running */
if (IS_OVERLAY_ACTIVE(fh) != 0) {
if (vv->video_fh != fh) {
DEB_D("refusing to change framebuffer informations while overlay is active in another open\n");
DEB_D("refusing to change framebuffer information while overlay is active in another open\n");
return -EBUSY;
}
}

2
drivers/media/dvb-frontends/m88ds3103.c
View file

@ -685,7 +685,7 @@ static int m88ds3103_init(struct dvb_frontend *fe)
/* request the firmware, this will block and timeout */
ret = request_firmware(&fw, fw_file, &client->dev);
if (ret) {
dev_err(&client->dev, "firmare file '%s' not found\n", fw_file);
dev_err(&client->dev, "firmware file '%s' not found\n", fw_file);
goto err;
}

4
drivers/media/dvb-frontends/si2165.c
View file

@ -541,7 +541,7 @@ static int si2165_upload_firmware(struct si2165_state *state)
&offset, block_count);
if (ret < 0) {
dev_err(&state->i2c->dev,
"%s: firmare could not be uploaded\n",
"%s: firmware could not be uploaded\n",
KBUILD_MODNAME);
goto error;
}
@ -565,7 +565,7 @@ static int si2165_upload_firmware(struct si2165_state *state)
if (len != offset) {
dev_err(&state->i2c->dev,
"%s: firmare len mismatch %04x != %04x\n",
"%s: firmware len mismatch %04x != %04x\n",
KBUILD_MODNAME, len, offset);
ret = -EINVAL;
goto error;

2
drivers/media/pci/netup_unidvb/netup_unidvb_core.c
View file

@ -387,7 +387,7 @@ static int netup_unidvb_dvb_init(struct netup_unidvb_dev *ndev,
vb2_dvb_alloc_frontend(
&ndev->frontends[num], 3) == NULL) {
dev_dbg(&ndev->pci_dev->dev,
"%s(): unable to to alllocate vb2_dvb_frontend\n",
"%s(): unable to allocate vb2_dvb_frontend\n",
__func__);
return -ENOMEM;
}