Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina:
- two cosmetic fixes from Daniel Axtens and Hans de Goede
- fix for I2C command mismatch fix for cp2112 driver from Eudean Sun
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: core: lower log level for unknown main item tags to warnings
HID: holtekff: move MODULE_* parameters out of #ifdef block
HID: cp2112: Fix I2C_BLOCK_DATA transactions
+18
-7
+1
-1
drivers/hid/hid-core.c
+1
-1
drivers/hid/hid-core.c
+13
-2
drivers/hid/hid-cp2112.c
+13
-2
drivers/hid/hid-cp2112.c
···
696
696
(u8 *)&word, 2);
697
697
break;
698
698
case I2C_SMBUS_I2C_BLOCK_DATA:
699
-
size = I2C_SMBUS_BLOCK_DATA;
700
-
/* fallthrough */
699
+
if (read_write == I2C_SMBUS_READ) {
700
+
read_length = data->block[0];
701
+
count = cp2112_write_read_req(buf, addr, read_length,
702
+
command, NULL, 0);
703
+
} else {
704
+
count = cp2112_write_req(buf, addr, command,
705
+
data->block + 1,
706
+
data->block[0]);
707
+
}
708
+
break;
701
709
case I2C_SMBUS_BLOCK_DATA:
702
710
if (I2C_SMBUS_READ == read_write) {
703
711
count = cp2112_write_read_req(buf, addr,
···
792
784
break;
793
785
case I2C_SMBUS_WORD_DATA:
794
786
data->word = le16_to_cpup((__le16 *)buf);
787
+
break;
788
+
case I2C_SMBUS_I2C_BLOCK_DATA:
789
+
memcpy(data->block + 1, buf, read_length);
795
790
break;
796
791
case I2C_SMBUS_BLOCK_DATA:
797
792
if (read_length > I2C_SMBUS_BLOCK_MAX) {
+4
-4
drivers/hid/hid-holtekff.c
+4
-4
drivers/hid/hid-holtekff.c
···
32
32
33
33
#ifdef CONFIG_HOLTEK_FF
34
34
35
-
MODULE_LICENSE("GPL");
36
-
MODULE_AUTHOR("Anssi Hannula <anssi.hannula@iki.fi>");
37
-
MODULE_DESCRIPTION("Force feedback support for Holtek On Line Grip based devices");
38
-
39
35
/*
40
36
* These commands and parameters are currently known:
41
37
*
···
219
223
.probe = holtek_probe,
220
224
};
221
225
module_hid_driver(holtek_driver);
226
+
227
+
MODULE_LICENSE("GPL");
228
+
MODULE_AUTHOR("Anssi Hannula <anssi.hannula@iki.fi>");
229
+
MODULE_DESCRIPTION("Force feedback support for Holtek On Line Grip based devices");