Re: [PATCH 3/6] HID: asus: Add hid_is_using_ll_driver(usb_hid_driver) check
From: Jiri Kosina <jikos@kernel.org>
Date: 2020-05-05 14:32:34
On Tue, 28 Apr 2020, Hans de Goede wrote:
quoted hunk ↗ jump to hunk
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 <redacted> --- drivers/hid/hid-asus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)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);
I am going to push the whole patchset to for-5.8/asus branch later today, but I guess this one should better be taken as 5.7 fix still, right? Thanks, -- Jiri Kosina SUSE Labs