aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hid
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-wacom.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
index b8778db720bc..8d3b46f5d149 100644
--- a/drivers/hid/hid-wacom.c
+++ b/drivers/hid/hid-wacom.c
@@ -181,6 +181,11 @@ static int wacom_probe(struct hid_device *hdev,
181 goto err_free; 181 goto err_free;
182 } 182 }
183 183
184 /*
185 * Note that if the raw queries fail, it's not a hard failure and it
186 * is safe to continue
187 */
188
184 /* Set Wacom mode2 */ 189 /* Set Wacom mode2 */
185 rep_data[0] = 0x03; rep_data[1] = 0x00; 190 rep_data[0] = 0x03; rep_data[1] = 0x00;
186 limit = 3; 191 limit = 3;
@@ -188,10 +193,8 @@ static int wacom_probe(struct hid_device *hdev,
188 ret = hdev->hid_output_raw_report(hdev, rep_data, 2, 193 ret = hdev->hid_output_raw_report(hdev, rep_data, 2,
189 HID_FEATURE_REPORT); 194 HID_FEATURE_REPORT);
190 } while (ret < 0 && limit-- > 0); 195 } while (ret < 0 && limit-- > 0);
191 if (ret < 0) { 196 if (ret < 0)
192 dev_err(&hdev->dev, "failed to poke device #1, %d\n", ret); 197 dev_warn(&hdev->dev, "failed to poke device #1, %d\n", ret);
193 goto err_free;
194 }
195 198
196 /* 0x06 - high reporting speed, 0x05 - low speed */ 199 /* 0x06 - high reporting speed, 0x05 - low speed */
197 rep_data[0] = 0x06; rep_data[1] = 0x00; 200 rep_data[0] = 0x06; rep_data[1] = 0x00;
@@ -200,10 +203,8 @@ static int wacom_probe(struct hid_device *hdev,
200 ret = hdev->hid_output_raw_report(hdev, rep_data, 2, 203 ret = hdev->hid_output_raw_report(hdev, rep_data, 2,
201 HID_FEATURE_REPORT); 204 HID_FEATURE_REPORT);
202 } while (ret < 0 && limit-- > 0); 205 } while (ret < 0 && limit-- > 0);
203 if (ret < 0) { 206 if (ret < 0)
204 dev_err(&hdev->dev, "failed to poke device #2, %d\n", ret); 207 dev_warn(&hdev->dev, "failed to poke device #2, %d\n", ret);
205 goto err_free;
206 }
207 208
208 hidinput = list_entry(hdev->inputs.next, struct hid_input, list); 209 hidinput = list_entry(hdev->inputs.next, struct hid_input, list);
209 input = hidinput->input; 210 input = hidinput->input;