1 files changed, 18 insertions, 18 deletions

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index abb7fdf05d92..e06af5b9f59e 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -1778,24 +1778,6 @@ static int wacom_probe(struct hid_device *hdev,
                 features->device_type |= WACOM_DEVICETYPE_PEN;
         }
 
-        /* Note that if query fails it is not a hard failure */
-        wacom_query_tablet_data(hdev, features);
-
-        /* touch only Bamboo doesn't support pen */
-        if ((features->type == BAMBOO_TOUCH) &&
-            (features->device_type & WACOM_DEVICETYPE_PEN)) {
-                error = -ENODEV;
-                goto fail_shared_data;
-        }
-
-        /* pen only Bamboo neither support touch nor pad */
-        if ((features->type == BAMBOO_PEN) &&
-            ((features->device_type & WACOM_DEVICETYPE_TOUCH) ||
-            (features->device_type & WACOM_DEVICETYPE_PAD))) {
-                error = -ENODEV;
-                goto fail_shared_data;
-        }
-
         wacom_calculate_res(features);
 
         wacom_update_name(wacom);
@@ -1833,6 +1815,24 @@ static int wacom_probe(struct hid_device *hdev,
                 goto fail_hw_start;
         }
 
+        /* Note that if query fails it is not a hard failure */
+        wacom_query_tablet_data(hdev, features);
+
+        /* touch only Bamboo doesn't support pen */
+        if ((features->type == BAMBOO_TOUCH) &&
+            (features->device_type & WACOM_DEVICETYPE_PEN)) {
+                error = -ENODEV;
+                goto fail_hw_start;
+        }
+
+        /* pen only Bamboo neither support touch nor pad */
+        if ((features->type == BAMBOO_PEN) &&
+            ((features->device_type & WACOM_DEVICETYPE_TOUCH) ||
+            (features->device_type & WACOM_DEVICETYPE_PAD))) {
+                error = -ENODEV;
+                goto fail_hw_start;
+        }
+
         if (features->device_type & WACOM_DEVICETYPE_WL_MONITOR)
                 error = hid_hw_open(hdev);