diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2020-04-28 17:22:51 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2020-05-06 12:40:03 +0300 |
| commit | 4bc43a421218b6cebc7c926fea001b166ea3677c (patch) | |
| tree | 668145e6f37ed193213e626fc42ae4d5e52a4347 /drivers/hid | |
| parent | a80b2f309883cb021ac05f992f785f15d7d748cf (diff) | |
| download | linux-4bc43a421218b6cebc7c926fea001b166ea3677c.tar.xz | |
HID: asus: Add hid_is_using_ll_driver(usb_hid_driver) check
Add a hid_is_using_ll_driver(usb_hid_driver) check to ensure that the
parent device is an usb_interface, before casting the parent device
pointer to an usb_interface pointer with to_usb_interface().
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid')
| -rw-r--r-- | drivers/hid/hid-asus.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index b3292ff3f61a..719eff589f92 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c @@ -842,7 +842,8 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id) if (drvdata->quirks & QUIRK_IS_MULTITOUCH) drvdata->tp = &asus_i2c_tp; - if (drvdata->quirks & QUIRK_T100_KEYBOARD) { + if ((drvdata->quirks & QUIRK_T100_KEYBOARD) && + hid_is_using_ll_driver(hdev, &usb_hid_driver)) { struct usb_interface *intf = to_usb_interface(hdev->dev.parent); if (intf->altsetting->desc.bInterfaceNumber == T100_TPAD_INTF) { |