aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Prémont <bonbons@linux-vserver.org>2012-08-19 12:56:31 -0400
committerJiri Kosina <jkosina@suse.cz>2012-09-19 07:43:51 -0400
commitbb5c32d99899b0c5c46c4b0d3165de66a6981f8a (patch)
treedf8bd0ffb2661adda6640de154c2f3c5b3909d62
parente9a7c79b9427b9c1ce17a007a80caf3deb390bcd (diff)
HID: picoLCD: drop version check during probe
Commit 4ea5454203d991ec85264f64f89ca8855fce69b0 [HID: Fix race condition between driver core and ll-driver] introduced new locking around probe/remove functions that prevents any report/reply from hardware to reach driver until it returned from probe. As such, the ask-reply way to checking picoLCD firmware version during probe is bound to timeout and let probe fail. Drop the check to let driver successfully probe again (until locking issues are resolved allowing to reinstate the check). Signed-off-by: Bruno Prémont <bonbons@linux-vserver.org> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/hid-picolcd_core.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c
index 8c9ec1facdb4..bd2a75185cb3 100644
--- a/drivers/hid/hid-picolcd_core.c
+++ b/drivers/hid/hid-picolcd_core.c
@@ -477,14 +477,6 @@ static int picolcd_probe_lcd(struct hid_device *hdev, struct picolcd_data *data)
477{ 477{
478 int error; 478 int error;
479 479
480 error = picolcd_check_version(hdev);
481 if (error)
482 return error;
483
484 if (data->version[0] != 0 && data->version[1] != 3)
485 hid_info(hdev, "Device with untested firmware revision, please submit /sys/kernel/debug/hid/%s/rdesc for this device.\n",
486 dev_name(&hdev->dev));
487
488 /* Setup keypad input device */ 480 /* Setup keypad input device */
489 error = picolcd_init_keys(data, picolcd_in_report(REPORT_KEY_STATE, hdev)); 481 error = picolcd_init_keys(data, picolcd_in_report(REPORT_KEY_STATE, hdev));
490 if (error) 482 if (error)
@@ -533,16 +525,6 @@ err:
533 525
534static int picolcd_probe_bootloader(struct hid_device *hdev, struct picolcd_data *data) 526static int picolcd_probe_bootloader(struct hid_device *hdev, struct picolcd_data *data)
535{ 527{
536 int error;
537
538 error = picolcd_check_version(hdev);
539 if (error)
540 return error;
541
542 if (data->version[0] != 1 && data->version[1] != 0)
543 hid_info(hdev, "Device with untested bootloader revision, please submit /sys/kernel/debug/hid/%s/rdesc for this device.\n",
544 dev_name(&hdev->dev));
545
546 picolcd_init_devfs(data, NULL, NULL, 528 picolcd_init_devfs(data, NULL, NULL,
547 picolcd_out_report(REPORT_BL_READ_MEMORY, hdev), 529 picolcd_out_report(REPORT_BL_READ_MEMORY, hdev),
548 picolcd_out_report(REPORT_BL_WRITE_MEMORY, hdev), NULL); 530 picolcd_out_report(REPORT_BL_WRITE_MEMORY, hdev), NULL);