Skip to content

Commit

Permalink
HID: make Wacom modesetting failures non-fatal
Browse files Browse the repository at this point in the history
With Wacom tablet mode-setting moved from userspace into kernel,
we don't have to consider failures of device queries through the
_raw callback as hard failure, as the driver can safely continue
anyway.

This is consistent with the current USB driver in wacom_sys.c

Reported-by: Ping Cheng <pinglinux@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
Jiri Kosina committed Feb 3, 2010
1 parent f9ce7c2 commit 342f31e
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions 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 342f31e

Please sign in to comment.