diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-19 00:02:27 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-19 00:02:27 +0200 |
| commit | 038c4bf85ba2bca715db3ca4d190de3e5299c6c3 (patch) | |
| tree | 087d4159caceecb334a322f5f1a3908d57159468 /drivers/input/tablet | |
| parent | Input: vmmouse - disable vmmouse before entering suspend mode (diff) | |
| parent | dt-bindings: google,cros-ec-keyb: Fixup bad compatible match (diff) | |
| download | linux-038c4bf85ba2bca715db3ca4d190de3e5299c6c3.tar.xz linux-038c4bf85ba2bca715db3ca4d190de3e5299c6c3.zip | |
Merge branch 'ib/5.17-cros-ec-keyb' into next
Merge changes to ChromeOS EC Keyboard driver.
Diffstat (limited to 'drivers/input/tablet')
| -rw-r--r-- | drivers/input/tablet/aiptek.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c index 3cd8ba7ee342..24ec4844a5c3 100644 --- a/drivers/input/tablet/aiptek.c +++ b/drivers/input/tablet/aiptek.c @@ -1786,15 +1786,13 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) input_set_abs_params(inputdev, ABS_TILT_Y, AIPTEK_TILT_MIN, AIPTEK_TILT_MAX, 0, 0); input_set_abs_params(inputdev, ABS_WHEEL, AIPTEK_WHEEL_MIN, AIPTEK_WHEEL_MAX - 1, 0, 0); - /* Verify that a device really has an endpoint */ - if (intf->cur_altsetting->desc.bNumEndpoints < 1) { + err = usb_find_common_endpoints(intf->cur_altsetting, + NULL, NULL, &endpoint, NULL); + if (err) { dev_err(&intf->dev, - "interface has %d endpoints, but must have minimum 1\n", - intf->cur_altsetting->desc.bNumEndpoints); - err = -EINVAL; + "interface has no int in endpoints, but must have minimum 1\n"); goto fail3; } - endpoint = &intf->cur_altsetting->endpoint[0].desc; /* Go set up our URB, which is called when the tablet receives * input. |