projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'iio-fixes-for-4.6a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...
[cascardo/linux.git]
/
drivers
/
hid
/
hid-dr.c
diff --git
a/drivers/hid/hid-dr.c
b/drivers/hid/hid-dr.c
index
1d78ba3
..
8fd4bf7
100644
(file)
--- a/
drivers/hid/hid-dr.c
+++ b/
drivers/hid/hid-dr.c
@@
-151,7
+151,7
@@
static inline int drff_init(struct hid_device *hid)
* descriptor. In any case, it's a wonder it works on Windows.
*
* Usage Page (Desktop), ; Generic desktop controls (01h)
* descriptor. In any case, it's a wonder it works on Windows.
*
* Usage Page (Desktop), ; Generic desktop controls (01h)
- * Usage (Joysti
k), ; Joysti
k (04h, application collection)
+ * Usage (Joysti
ck), ; Joystic
k (04h, application collection)
* Collection (Application),
* Collection (Logical),
* Report Size (8),
* Collection (Application),
* Collection (Logical),
* Report Size (8),
@@
-207,7
+207,7
@@
static inline int drff_init(struct hid_device *hid)
/* Fixed report descriptor for PID 0x011 joystick */
static __u8 pid0011_rdesc_fixed[] = {
0x05, 0x01, /* Usage Page (Desktop), */
/* Fixed report descriptor for PID 0x011 joystick */
static __u8 pid0011_rdesc_fixed[] = {
0x05, 0x01, /* Usage Page (Desktop), */
- 0x09, 0x04, /* Usage (Joysti
k),
*/
+ 0x09, 0x04, /* Usage (Joysti
ck),
*/
0xA1, 0x01, /* Collection (Application), */
0xA1, 0x02, /* Collection (Logical), */
0x14, /* Logical Minimum (0), */
0xA1, 0x01, /* Collection (Application), */
0xA1, 0x02, /* Collection (Logical), */
0x14, /* Logical Minimum (0), */