That is where they belong...

Signed-off-by: Ping Cheng <pi...@wacom.com>
---
 drivers/hid/wacom_sys.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index ca30eab..855f3b3 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -1365,6 +1365,12 @@ static void wacom_set_default_phy(struct wacom_features 
*features)
 
 static void wacom_calculate_res(struct wacom_features *features)
 {
+       /* set unit to "100th of a mm" for devices not reported by HID */
+       if (!features->unit) {
+               features->unit = 0x11;
+               features->unitExpo = -3;
+       }
+
        features->x_resolution = wacom_calc_hid_res(features->x_max,
                                                    features->x_phy,
                                                    features->unit,
@@ -1505,16 +1511,8 @@ static int wacom_probe(struct hid_device *hdev,
        wacom_retrieve_hid_descriptor(hdev, features);
 
        wacom_setup_device_quirks(wacom);
-
-       /* set unit to "100th of a mm" for devices not reported by HID */
-       if (!features->unit) {
-               features->unit = 0x11;
-               features->unitExpo = -3;
-       }
        wacom_calculate_res(features);
-
        wacom_update_name(wacom);
-
        error = wacom_add_shared_data(hdev);
        if (error)
                goto fail_shared_data;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to