[Linuxwacom-devel] [PATCH 1/3] Fix compile issues with 3.17 backports

[Jason G. <kil...@gm...>]

Signed-off-by: Jason Gerecke <kil...@gm...>
---
 2.6.36/wacom_sys.c | 4 ++--
 2.6.38/wacom_sys.c | 6 +++---
 3.7/wacom_sys.c    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/2.6.36/wacom_sys.c b/2.6.36/wacom_sys.c
index 14962d7..6fb0d10 100644
--- a/2.6.36/wacom_sys.c
+++ b/2.6.36/wacom_sys.c
@@ -503,8 +503,8 @@ static int wacom_led_control(struct wacom *wacom)
 
 		buf[0] = report_id;
 		if (wacom->wacom_wac.pid) {
-			wacom_get_report(wacom->hdev, HID_FEATURE_REPORT,
-					 buf, buf_size, WAC_CMD_RETRIES);
+			wacom_get_report(wacom->intf, HID_FEATURE_REPORT,
+					 buf[0], buf, buf_size, WAC_CMD_RETRIES);
 			buf[0] = report_id;
 			buf[4] = led_bits;
 		} else
diff --git a/2.6.38/wacom_sys.c b/2.6.38/wacom_sys.c
index e14359f..350950a 100644
--- a/2.6.38/wacom_sys.c
+++ b/2.6.38/wacom_sys.c
@@ -755,8 +755,8 @@ static int wacom_led_control(struct wacom *wacom)
 
 		buf[0] = report_id;
 		if (wacom->wacom_wac.pid) {
-			wacom_get_report(wacom->hdev, HID_FEATURE_REPORT,
-					 buf, buf_size, WAC_CMD_RETRIES);
+			wacom_get_report(wacom->intf, WAC_HID_FEATURE_REPORT,
+					 buf[0], buf, buf_size, WAC_CMD_RETRIES);
 			buf[0] = report_id;
 			buf[4] = led_bits;
 		} else
@@ -854,7 +854,7 @@ static ssize_t wacom_led##SET_ID##_select_show(struct device *dev,	\
 	struct device_attribute *attr, char *buf)			\
 {									\
 	struct wacom *wacom = dev_get_drvdata(dev);			\
-	return snprintf(buf, PAGE_SIZE, "%d\n",
+	return snprintf(buf, PAGE_SIZE, "%d\n",				\
 			wacom->led.select[SET_ID]);			\
 }									\
 static DEVICE_ATTR(status_led##SET_ID##_select, DEV_ATTR_RW_PERM,	\
diff --git a/3.7/wacom_sys.c b/3.7/wacom_sys.c
index 2ae6c5c..11d6e0d 100644
--- a/3.7/wacom_sys.c
+++ b/3.7/wacom_sys.c
@@ -752,8 +752,8 @@ static int wacom_led_control(struct wacom *wacom)
 
 		buf[0] = report_id;
 		if (wacom->wacom_wac.pid) {
-			wacom_get_report(wacom->hdev, HID_FEATURE_REPORT,
-					 buf, buf_size, WAC_CMD_RETRIES);
+			wacom_get_report(wacom->intf, WAC_HID_FEATURE_REPORT,
+					 buf[0], buf, buf_size, WAC_CMD_RETRIES);
 			buf[0] = report_id;
 			buf[4] = led_bits;
 		} else
@@ -851,7 +851,7 @@ static ssize_t wacom_led##SET_ID##_select_show(struct device *dev,	\
 	struct device_attribute *attr, char *buf)			\
 {									\
 	struct wacom *wacom = dev_get_drvdata(dev);			\
-	return snprintf(buf, PAGE_SIZE, "%d\n",
+	return snprintf(buf, PAGE_SIZE, "%d\n",				\
 			wacom->led.select[SET_ID]);			\
 }									\
 static DEVICE_ATTR(status_led##SET_ID##_select, DEV_ATTR_RW_PERM,	\
-- 
2.1.1