diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
| commit | d14b7a419a664cd7c1c585c9e7fffee9e9051d53 (patch) | |
| tree | 42a1d5b61b58fa0a75252b082c4c6cef6fa9fd8d /drivers/input | |
| parent | e8ff13b0bf88b5e696323a1eec877783d965b3c6 (diff) | |
| parent | a58b3a4aba2fd5c445d9deccc73192bff48b591d (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Trivial updates all over the place as usual."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
Fix typo in include/linux/clk.h .
pci: hotplug: Fix typo in pci
iommu: Fix typo in iommu
video: Fix typo in drivers/video
Documentation: Add newline at end-of-file to files lacking one
arm,unicore32: Remove obsolete "select MISC_DEVICES"
module.c: spelling s/postition/position/g
cpufreq: Fix typo in cpufreq driver
trivial: typo in comment in mksysmap
mach-omap2: Fix typo in debug message and comment
scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
Change email address for Steve Glendinning
Btrfs: fix typo in convert_extent_bit
via: Remove bogus if check
netprio_cgroup.c: fix comment typo
backlight: fix memory leak on obscure error path
Documentation: asus-laptop.txt references an obsolete Kconfig item
Documentation: ManagementStyle: fixed typo
mm/vmscan: cleanup comment error in balance_pgdat
mm: cleanup on the comments of zone_reclaim_stat
...
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/keyboard/lm8333.c | 2 | ||||
| -rw-r--r-- | drivers/input/misc/cma3000_d0x.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/lm8333.c b/drivers/input/keyboard/lm8333.c index ca168a6679de..081fd9effa8c 100644 --- a/drivers/input/keyboard/lm8333.c +++ b/drivers/input/keyboard/lm8333.c | |||
| @@ -91,7 +91,7 @@ static void lm8333_key_handler(struct lm8333 *lm8333) | |||
| 91 | return; | 91 | return; |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | for (i = 0; keys[i] && i < LM8333_FIFO_TRANSFER_SIZE; i++) { | 94 | for (i = 0; i < LM8333_FIFO_TRANSFER_SIZE && keys[i]; i++) { |
| 95 | pressed = keys[i] & 0x80; | 95 | pressed = keys[i] & 0x80; |
| 96 | code = keys[i] & 0x7f; | 96 | code = keys[i] & 0x7f; |
| 97 | 97 | ||
diff --git a/drivers/input/misc/cma3000_d0x.c b/drivers/input/misc/cma3000_d0x.c index a3735a01e9fd..df9b756594f8 100644 --- a/drivers/input/misc/cma3000_d0x.c +++ b/drivers/input/misc/cma3000_d0x.c | |||
| @@ -58,7 +58,7 @@ | |||
| 58 | 58 | ||
| 59 | /* | 59 | /* |
| 60 | * Bit weights in mg for bit 0, other bits need | 60 | * Bit weights in mg for bit 0, other bits need |
| 61 | * multipy factor 2^n. Eight bit is the sign bit. | 61 | * multiply factor 2^n. Eight bit is the sign bit. |
| 62 | */ | 62 | */ |
| 63 | #define BIT_TO_2G 18 | 63 | #define BIT_TO_2G 18 |
| 64 | #define BIT_TO_8G 71 | 64 | #define BIT_TO_8G 71 |