From 6132228b44d1799c2388c5563877b17954808a67 Mon Sep 17 00:00:00 2001
From: Ping Cheng <pingc@wacom.com>
Date: Tue, 13 Apr 2010 23:07:52 -0700
Subject: [PATCH] --- yaml --- r: 189929 b: refs/heads/master c:
 014f61504af276ba9d9544d8a7401d8f8526eb73 h: refs/heads/master i:   189927:
 56f0f6afe24b137120a60ae4e6d1edd4e6e50a11 v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/input/tablet/wacom_sys.c | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index f24a63028e6f..112887fc66e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afb567e3fdd2ee43b243cb4f6fe772ab921b2ada
+refs/heads/master: 014f61504af276ba9d9544d8a7401d8f8526eb73
diff --git a/trunk/drivers/input/tablet/wacom_sys.c b/trunk/drivers/input/tablet/wacom_sys.c
index 8b5d2873f0c4..f46502589e4e 100644
--- a/trunk/drivers/input/tablet/wacom_sys.c
+++ b/trunk/drivers/input/tablet/wacom_sys.c
@@ -673,13 +673,15 @@ static int wacom_resume(struct usb_interface *intf)
 	int rv;
 
 	mutex_lock(&wacom->lock);
-	if (wacom->open) {
+
+	/* switch to wacom mode first */
+	wacom_query_tablet_data(intf, features);
+
+	if (wacom->open)
 		rv = usb_submit_urb(wacom->irq, GFP_NOIO);
-		/* switch to wacom mode if needed */
-		if (!wacom_retrieve_hid_descriptor(intf, features))
-			wacom_query_tablet_data(intf, features);
-	} else
+	else
 		rv = 0;
+
 	mutex_unlock(&wacom->lock);
 
 	return rv;