diff options
| author | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2023-02-22 12:39:05 +0300 |
|---|---|---|
| committer | Benjamin Tissoires <benjamin.tissoires@redhat.com> | 2023-02-22 12:39:05 +0300 |
| commit | c21c9feed40e8e64ad73d81acaecf6feaf860300 (patch) | |
| tree | 539b93527febbf003069f9a89d5485484e73b6c7 /drivers/hid/hid-quirks.c | |
| parent | 3ba2824ca2e38c4fa80086a91f09f2187ea120ef (diff) | |
| parent | 03a86105556e23650e4470c09f91cf7c360d5e28 (diff) | |
| download | linux-c21c9feed40e8e64ad73d81acaecf6feaf860300.tar.xz | |
Merge branch 'for-6.3/multitouch' into for-linus
Allow to pass quirks from i2c-hid to hid-multitouch (Allen Ballway &
Dmitry Torokhov)
Diffstat (limited to 'drivers/hid/hid-quirks.c')
| -rw-r--r-- | drivers/hid/hid-quirks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index 5bc91f68b374..66e64350f138 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -1237,7 +1237,7 @@ EXPORT_SYMBOL_GPL(hid_quirks_exit); static unsigned long hid_gets_squirk(const struct hid_device *hdev) { const struct hid_device_id *bl_entry; - unsigned long quirks = 0; + unsigned long quirks = hdev->initial_quirks; if (hid_match_id(hdev, hid_ignore_list)) quirks |= HID_QUIRK_IGNORE; |