]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
HID: picoLCD: drop version check during probe
authorBruno Prémont <bonbons@linux-vserver.org>
Sun, 19 Aug 2012 16:56:31 +0000 (18:56 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 19 Sep 2012 11:43:51 +0000 (13:43 +0200)
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>
drivers/hid/hid-picolcd_core.c

index 8c9ec1facdb4fb236142fb2ecf32731b27874040..bd2a75185cb35cb5c81b047a8939b779bff902d7 100644 (file)
@@ -477,14 +477,6 @@ static int picolcd_probe_lcd(struct hid_device *hdev, struct picolcd_data *data)
 {
        int error;
 
-       error = picolcd_check_version(hdev);
-       if (error)
-               return error;
-
-       if (data->version[0] != 0 && data->version[1] != 3)
-               hid_info(hdev, "Device with untested firmware revision, please submit /sys/kernel/debug/hid/%s/rdesc for this device.\n",
-                        dev_name(&hdev->dev));
-
        /* Setup keypad input device */
        error = picolcd_init_keys(data, picolcd_in_report(REPORT_KEY_STATE, hdev));
        if (error)
@@ -533,16 +525,6 @@ err:
 
 static int picolcd_probe_bootloader(struct hid_device *hdev, struct picolcd_data *data)
 {
-       int error;
-
-       error = picolcd_check_version(hdev);
-       if (error)
-               return error;
-
-       if (data->version[0] != 1 && data->version[1] != 0)
-               hid_info(hdev, "Device with untested bootloader revision, please submit /sys/kernel/debug/hid/%s/rdesc for this device.\n",
-                        dev_name(&hdev->dev));
-
        picolcd_init_devfs(data, NULL, NULL,
                        picolcd_out_report(REPORT_BL_READ_MEMORY, hdev),
                        picolcd_out_report(REPORT_BL_WRITE_MEMORY, hdev), NULL);