Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 180860
b: refs/heads/master
c: 342f31e
h: refs/heads/master
v: v3
  • Loading branch information
Jiri Kosina committed Feb 3, 2010
1 parent e70cfc9 commit ac9196b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f9ce7c283c16538955d5d094101889792bcde109
refs/heads/master: 342f31e84eec9002b75f6fcdec6bd932ac77a390
17 changes: 9 additions & 8 deletions trunk/drivers/hid/hid-wacom.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,17 +181,20 @@ static int wacom_probe(struct hid_device *hdev,
goto err_free;
}

/*
* Note that if the raw queries fail, it's not a hard failure and it
* is safe to continue
*/

/* Set Wacom mode2 */
rep_data[0] = 0x03; rep_data[1] = 0x00;
limit = 3;
do {
ret = hdev->hid_output_raw_report(hdev, rep_data, 2,
HID_FEATURE_REPORT);
} while (ret < 0 && limit-- > 0);
if (ret < 0) {
dev_err(&hdev->dev, "failed to poke device #1, %d\n", ret);
goto err_free;
}
if (ret < 0)
dev_warn(&hdev->dev, "failed to poke device #1, %d\n", ret);

/* 0x06 - high reporting speed, 0x05 - low speed */
rep_data[0] = 0x06; rep_data[1] = 0x00;
Expand All @@ -200,10 +203,8 @@ static int wacom_probe(struct hid_device *hdev,
ret = hdev->hid_output_raw_report(hdev, rep_data, 2,
HID_FEATURE_REPORT);
} while (ret < 0 && limit-- > 0);
if (ret < 0) {
dev_err(&hdev->dev, "failed to poke device #2, %d\n", ret);
goto err_free;
}
if (ret < 0)
dev_warn(&hdev->dev, "failed to poke device #2, %d\n", ret);

hidinput = list_entry(hdev->inputs.next, struct hid_input, list);
input = hidinput->input;
Expand Down

0 comments on commit ac9196b

Please sign in to comment.