From: Nikolai Kondrashov <spbnick@gmail.com>
Date: Sun, 10 Feb 2019 10:14:06 +0000 (+0200)
Subject: HID: uclogic: Do not initialize non-USB devices
X-Git-Tag: v5.1-rc1~115^2~3^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=8547b7789c62f81350422d357fdf48bfe5d9932f;p=linux.git

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: Nikolai Kondrashov <spbnick@gmail.com>
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
---

diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c
index b582739a570a..7710d9f957da 100644
--- a/drivers/hid/hid-uclogic-params.c
+++ b/drivers/hid/hid-uclogic-params.c
@@ -826,7 +826,8 @@ static int uclogic_params_huion_init(struct uclogic_params *params,
  *		uclogic_params_cleanup()). Not modified in case of error.
  *		Cannot be NULL.
  * @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:
  *	Zero, if successful. A negative errno code on error.
@@ -844,7 +845,8 @@ int uclogic_params_init(struct uclogic_params *params,
 	struct uclogic_params p = {0, };
 
 	/* Check arguments */
-	if (params == NULL || hdev == NULL) {
+	if (params == NULL || hdev == NULL ||
+	    !hid_is_using_ll_driver(hdev, &usb_hid_driver)) {
 		rc = -EINVAL;
 		goto cleanup;
 	}