Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
Pull HID fixes from Jiri Kosina: - spectrev1 pattern fix in hiddev from Gustavo A. R. Silva - bounds check fix for hid-debug from Daniel Rosenberg - regression fix for HID autobinding from Benjamin Tissoires - removal of excessive logging from i2c-hid driver from Jason Andryuk - fix specific to 2nd generation of Wacom Intuos devices from Jason Gerecke * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: hiddev: fix potential Spectre v1 HID: i2c-hid: Fix "incomplete report" noise HID: wacom: Correct touch maximum XY of 2nd-gen Intuos HID: debug: check length before copy_to_user() HID: core: allow concurrent registration of drivers
This commit is contained in:
@@ -1952,6 +1952,8 @@ static int hid_device_probe(struct device *dev)
|
||||
}
|
||||
hdev->io_started = false;
|
||||
|
||||
clear_bit(ffs(HID_STAT_REPROBED), &hdev->status);
|
||||
|
||||
if (!hdev->driver) {
|
||||
id = hid_match_device(hdev, hdrv);
|
||||
if (id == NULL) {
|
||||
@@ -2215,7 +2217,8 @@ static int __hid_bus_reprobe_drivers(struct device *dev, void *data)
|
||||
struct hid_device *hdev = to_hid_device(dev);
|
||||
|
||||
if (hdev->driver == hdrv &&
|
||||
!hdrv->match(hdev, hid_ignore_special_drivers))
|
||||
!hdrv->match(hdev, hid_ignore_special_drivers) &&
|
||||
!test_and_set_bit(ffs(HID_STAT_REPROBED), &hdev->status))
|
||||
return device_reprobe(dev);
|
||||
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user