Commit 8547b778 authored by Nikolai Kondrashov's avatar Nikolai Kondrashov Committed by Benjamin Tissoires

HID: uclogic: Do not initialize non-USB devices

Do not try to initialize UC-Logic tablets if the underlying device is
not a USB device, but e.g. a uhid device.
Signed-off-by: default avatarNikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
parent e902ed93
...@@ -826,7 +826,8 @@ static int uclogic_params_huion_init(struct uclogic_params *params, ...@@ -826,7 +826,8 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
* uclogic_params_cleanup()). Not modified in case of error. * uclogic_params_cleanup()). Not modified in case of error.
* Cannot be NULL. * Cannot be NULL.
* @hdev: The HID device of the tablet interface to initialize and get * @hdev: The HID device of the tablet interface to initialize and get
* parameters from. Cannot be NULL. * parameters from. Cannot be NULL. Must be using the USB low-level
* driver, i.e. be an actual USB tablet.
* *
* Returns: * Returns:
* Zero, if successful. A negative errno code on error. * Zero, if successful. A negative errno code on error.
...@@ -844,7 +845,8 @@ int uclogic_params_init(struct uclogic_params *params, ...@@ -844,7 +845,8 @@ int uclogic_params_init(struct uclogic_params *params,
struct uclogic_params p = {0, }; struct uclogic_params p = {0, };
/* Check arguments */ /* Check arguments */
if (params == NULL || hdev == NULL) { if (params == NULL || hdev == NULL ||
!hid_is_using_ll_driver(hdev, &usb_hid_driver)) {
rc = -EINVAL; rc = -EINVAL;
goto cleanup; goto cleanup;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment