From: Ping Cheng <pingli...@gmail.com>
Signed-off-by: Ping Cheng <pi...@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torok...@gmail.com>
Signed-off-by: Jason Gerecke <killert...@gmail.com>
---
2.6.30/wacom_sys.c | 8 --------
2.6.36/wacom_sys.c | 8 --------
2.6.38/wacom_sys.c | 3 ---
3.7/wacom_sys.c | 3 ---
4 files changed, 22 deletions(-)
diff --git a/2.6.30/wacom_sys.c b/2.6.30/wacom_sys.c
index 2fb69cf..c357a99 100755
--- a/2.6.30/wacom_sys.c
+++ b/2.6.30/wacom_sys.c
@@ -378,10 +378,6 @@ static int wacom_query_tablet_data(struct usb_interface
*intf, struct wacom_feat
report_id = 3;
error = wacom_set_report(intf,
WAC_HID_FEATURE_REPORT,
report_id, rep_data, 4, 1);
- if (error >= 0)
- error = wacom_get_report(intf,
- WAC_HID_FEATURE_REPORT,
report_id,
- rep_data, 4, 1);
} while ((error < 0 || rep_data[1] != 4) && limit++ <
5);
}
} else if (features->type <= BAMBOO_PT) {
@@ -390,10 +386,6 @@ static int wacom_query_tablet_data(struct usb_interface
*intf, struct wacom_feat
rep_data[1] = 2;
error = wacom_set_report(intf, WAC_HID_FEATURE_REPORT,
report_id, rep_data, 2, 1);
- if (error >= 0)
- error = wacom_get_report(intf,
- WAC_HID_FEATURE_REPORT, report_id,
- rep_data, 2, 1);
} while ((error < 0 || rep_data[1] != 2) && limit++ < 5);
}
diff --git a/2.6.36/wacom_sys.c b/2.6.36/wacom_sys.c
index 81615c7..ed8297a 100644
--- a/2.6.36/wacom_sys.c
+++ b/2.6.36/wacom_sys.c
@@ -355,10 +355,6 @@ static int wacom_query_tablet_data(struct usb_interface
*intf, struct wacom_feat
report_id = 3;
error = wacom_set_report(intf, WAC_HID_FEATURE_REPORT,
report_id, rep_data, 4, 1);
- if (error >= 0)
- error = wacom_get_report(intf,
- WAC_HID_FEATURE_REPORT, report_id,
- rep_data, 4, 1);
} while ((error < 0 || rep_data[1] != 4) && limit++ <
WAC_MSG_RETRIES);
} else if (features->type != TABLETPC &&
features->device_type == BTN_TOOL_PEN) {
@@ -367,10 +363,6 @@ static int wacom_query_tablet_data(struct usb_interface
*intf, struct wacom_feat
rep_data[1] = 2;
error = wacom_set_report(intf, WAC_HID_FEATURE_REPORT,
report_id, rep_data, 2, 1);
- if (error >= 0)
- error = wacom_get_report(intf,
- WAC_HID_FEATURE_REPORT, report_id,
- rep_data, 2, 1);
} while ((error < 0 || rep_data[1] != 2) && limit++ <
WAC_MSG_RETRIES);
}
diff --git a/2.6.38/wacom_sys.c b/2.6.38/wacom_sys.c
index 6848717..e63654e 100644
--- a/2.6.38/wacom_sys.c
+++ b/2.6.38/wacom_sys.c
@@ -524,9 +524,6 @@ static int wacom_set_device_mode(struct usb_interface
*intf, int report_id, int
error = wacom_set_report(intf, WAC_HID_FEATURE_REPORT,
report_id, rep_data, length, 1);
- if (error >= 0)
- error = wacom_get_report(intf, WAC_HID_FEATURE_REPORT,
- report_id, rep_data, length,
1);
} while ((error < 0 || rep_data[1] != mode) && limit++ <
WAC_MSG_RETRIES);
kfree(rep_data);
diff --git a/3.7/wacom_sys.c b/3.7/wacom_sys.c
index 65e5420..79ab488 100644
--- a/3.7/wacom_sys.c
+++ b/3.7/wacom_sys.c
@@ -524,9 +524,6 @@ static int wacom_set_device_mode(struct usb_interface
*intf, int report_id, int
error = wacom_set_report(intf, WAC_HID_FEATURE_REPORT,
report_id, rep_data, length, 1);
- if (error >= 0)
- error = wacom_get_report(intf, WAC_HID_FEATURE_REPORT,
- report_id, rep_data, length,
1);
} while ((error < 0 || rep_data[1] != mode) && limit++ <
WAC_MSG_RETRIES);
kfree(rep_data);
--
1.8.4
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
