HID: wacom: Fail probe if HID_GENERIC device has unknown device_type

[mirror_ubuntu-zesty-kernel.git] / drivers / hid / wacom_sys.c

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 157aa7aa1067a4b2cff7c527594c58af6da89a3b..7abf52caa8d81000997c3fa6efae8e818ae0764f 100644 (file)
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -1528,8 +1528,14 @@ static int wacom_probe(struct hid_device *hdev,
        wacom_setup_device_quirks(wacom);
 
        if (!features->device_type && features->type != WIRELESS) {
+               error = features->type == HID_GENERIC ? -ENODEV : 0;
+
                dev_warn(&hdev->dev, "Unknown device_type for '%s'. %s.",
-                        hdev->name, "Assuming pen");
+                        hdev->name,
+                        error ? "Ignoring" : "Assuming pen");
+
+               if (error)
+                       goto fail_shared_data;
 
                features->device_type = BTN_TOOL_PEN;
        }