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 "trivial tree" updates from Jiri Kosina: "Usual pile from trivial tree everyone is so eagerly waiting for" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits) Remove MN10300_PROC_MN2WS0038 mei: fix comments treewide: Fix typos in Kconfig kprobes: update jprobe_example.c for do_fork() change Documentation: change "&" to "and" in Documentation/applying-patches.txt Documentation: remove obsolete pcmcia-cs from Changes Documentation: update links in Changes Documentation: Docbook: Fix generated DocBook/kernel-api.xml score: Remove GENERIC_HAS_IOMAP gpio: fix 'CONFIG_GPIO_IRQCHIP' comments tty: doc: Fix grammar in serial/tty dma-debug: modify check_for_stack output treewide: fix errors in printk genirq: fix reference in devm_request_threaded_irq comment treewide: fix synchronize_rcu() in comments checkstack.pl: port to AArch64 doc: queue-sysfs: minor fixes init/do_mounts: better syntax description MIPS: fix comment spelling powerpc/simpleboot: fix comment ...
This commit is contained in:
commit
28596c9722
92 changed files with 125 additions and 135 deletions
|
|
@ -224,7 +224,7 @@ static inline unsigned int lpf_count_to_us(unsigned int count)
|
|||
}
|
||||
|
||||
/*
|
||||
* FIFO register pulse width count compuations
|
||||
* FIFO register pulse width count computations
|
||||
*/
|
||||
static u32 clock_divider_to_resolution(u16 divider)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ static inline unsigned int lpf_count_to_us(unsigned int count)
|
|||
}
|
||||
|
||||
/*
|
||||
* FIFO register pulse width count compuations
|
||||
* FIFO register pulse width count computations
|
||||
*/
|
||||
static u32 clock_divider_to_resolution(u16 divider)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ static int vv6410_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
|
|||
fine = val % VV6410_CIF_LINELENGTH;
|
||||
coarse = min(512, val / VV6410_CIF_LINELENGTH);
|
||||
|
||||
PDEBUG(D_CONF, "Set coarse exposure to %d, fine expsure to %d",
|
||||
PDEBUG(D_CONF, "Set coarse exposure to %d, fine exposure to %d",
|
||||
coarse, fine);
|
||||
|
||||
err = stv06xx_write_sensor(sd, VV6410_FINEH, fine >> 8);
|
||||
|
|
|
|||
Loading…
Reference in a new issue