|
@@ -128,7 +128,8 @@ static void wacom_set_image(struct hid_device *hdev, const char *image,
|
|
|
|
|
|
rep_data[0] = WAC_CMD_ICON_START_STOP;
|
|
|
rep_data[1] = 0;
|
|
|
- ret = hid_output_raw_report(hdev, rep_data, 2, HID_FEATURE_REPORT);
|
|
|
+ ret = hid_hw_raw_request(hdev, rep_data[0], rep_data, 2,
|
|
|
+ HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
|
|
|
if (ret < 0)
|
|
|
goto err;
|
|
|
|
|
@@ -142,14 +143,15 @@ static void wacom_set_image(struct hid_device *hdev, const char *image,
|
|
|
rep_data[j + 3] = p[(i << 6) + j];
|
|
|
|
|
|
rep_data[2] = i;
|
|
|
- ret = hid_output_raw_report(hdev, rep_data, 67,
|
|
|
- HID_FEATURE_REPORT);
|
|
|
+ ret = hid_hw_raw_request(hdev, rep_data[0], rep_data, 67,
|
|
|
+ HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
|
|
|
}
|
|
|
|
|
|
rep_data[0] = WAC_CMD_ICON_START_STOP;
|
|
|
rep_data[1] = 0;
|
|
|
|
|
|
- ret = hid_output_raw_report(hdev, rep_data, 2, HID_FEATURE_REPORT);
|
|
|
+ ret = hid_hw_raw_request(hdev, rep_data[0], rep_data, 2,
|
|
|
+ HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
|
|
|
|
|
|
err:
|
|
|
return;
|
|
@@ -181,7 +183,8 @@ static void wacom_leds_set_brightness(struct led_classdev *led_dev,
|
|
|
buf[3] = value;
|
|
|
/* use fixed brightness for OLEDs */
|
|
|
buf[4] = 0x08;
|
|
|
- hid_output_raw_report(hdev, buf, 9, HID_FEATURE_REPORT);
|
|
|
+ hid_hw_raw_request(hdev, buf[0], buf, 9, HID_FEATURE_REPORT,
|
|
|
+ HID_REQ_SET_REPORT);
|
|
|
kfree(buf);
|
|
|
}
|
|
|
|
|
@@ -337,8 +340,8 @@ static void wacom_set_features(struct hid_device *hdev, u8 speed)
|
|
|
rep_data[0] = 0x03 ; rep_data[1] = 0x00;
|
|
|
limit = 3;
|
|
|
do {
|
|
|
- ret = hid_output_raw_report(hdev, rep_data, 2,
|
|
|
- HID_FEATURE_REPORT);
|
|
|
+ ret = hid_hw_raw_request(hdev, rep_data[0], rep_data, 2,
|
|
|
+ HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
|
|
|
} while (ret < 0 && limit-- > 0);
|
|
|
|
|
|
if (ret >= 0) {
|
|
@@ -350,8 +353,9 @@ static void wacom_set_features(struct hid_device *hdev, u8 speed)
|
|
|
rep_data[1] = 0x00;
|
|
|
limit = 3;
|
|
|
do {
|
|
|
- ret = hid_output_raw_report(hdev,
|
|
|
- rep_data, 2, HID_FEATURE_REPORT);
|
|
|
+ ret = hid_hw_raw_request(hdev, rep_data[0],
|
|
|
+ rep_data, 2, HID_FEATURE_REPORT,
|
|
|
+ HID_REQ_SET_REPORT);
|
|
|
} while (ret < 0 && limit-- > 0);
|
|
|
|
|
|
if (ret >= 0) {
|
|
@@ -376,8 +380,8 @@ static void wacom_set_features(struct hid_device *hdev, u8 speed)
|
|
|
rep_data[0] = 0x03;
|
|
|
rep_data[1] = wdata->features;
|
|
|
|
|
|
- ret = hid_output_raw_report(hdev, rep_data, 2,
|
|
|
- HID_FEATURE_REPORT);
|
|
|
+ ret = hid_hw_raw_request(hdev, rep_data[0], rep_data, 2,
|
|
|
+ HID_FEATURE_REPORT, HID_REQ_SET_REPORT);
|
|
|
if (ret >= 0)
|
|
|
wdata->high_speed = speed;
|
|
|
break;
|