diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
| commit | dba861461f88c12249ac78fb877866c04f99deb3 (patch) | |
| tree | 5812b143581bcc66c7c542f01ba0cb22e489b8e5 /drivers/media/rc/imon.c | |
| parent | 0e6601eee039893a3f6420596ae4588d90d13cbe (diff) | |
| parent | 228fdc083b017eaf90e578fa86fb1ecfd5ffae87 (diff) | |
Merge branch 'linus' into timers/core
Pick up the latest fixes and refresh the branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/media/rc/imon.c')
| -rw-r--r-- | drivers/media/rc/imon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c index 72e3fa652481..f329485c6629 100644 --- a/drivers/media/rc/imon.c +++ b/drivers/media/rc/imon.c | |||
| @@ -1370,7 +1370,7 @@ static void imon_pad_to_keys(struct imon_context *ictx, unsigned char *buf) | |||
| 1370 | * 0x68nnnnB7 to 0x6AnnnnB7, the left mouse button generates | 1370 | * 0x68nnnnB7 to 0x6AnnnnB7, the left mouse button generates |
| 1371 | * 0x688301b7 and the right one 0x688481b7. All other keys generate | 1371 | * 0x688301b7 and the right one 0x688481b7. All other keys generate |
| 1372 | * 0x2nnnnnnn. Position coordinate is encoded in buf[1] and buf[2] with | 1372 | * 0x2nnnnnnn. Position coordinate is encoded in buf[1] and buf[2] with |
| 1373 | * reversed endianess. Extract direction from buffer, rotate endianess, | 1373 | * reversed endianness. Extract direction from buffer, rotate endianness, |
| 1374 | * adjust sign and feed the values into stabilize(). The resulting codes | 1374 | * adjust sign and feed the values into stabilize(). The resulting codes |
| 1375 | * will be 0x01008000, 0x01007F00, which match the newer devices. | 1375 | * will be 0x01008000, 0x01007F00, which match the newer devices. |
| 1376 | */ | 1376 | */ |