]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
HID: lenovo: Add checks to fix of_led_classdev_register
authorAditya Pakki <pakki001@umn.edu>
Mon, 24 Dec 2018 21:39:14 +0000 (15:39 -0600)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Wed, 14 Aug 2019 09:18:49 +0000 (11:18 +0200)
BugLink: https://bugs.launchpad.net/bugs/1837664
[ Upstream commit 6ae16dfb61bce538d48b7fe98160fada446056c5 ]

In lenovo_probe_tpkbd(), the function of_led_classdev_register() could
return an error value that is unchecked. The fix adds these checks.

Signed-off-by: Aditya Pakki <pakki001@umn.edu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
drivers/hid/hid-lenovo.c

index 643b6eb54442ed4bc297e182ad1b7c77a25e82c0..eacc76d2ab96019564ed6ca3b7442faf7d7b623d 100644 (file)
@@ -743,7 +743,9 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev)
        data_pointer->led_mute.brightness_get = lenovo_led_brightness_get_tpkbd;
        data_pointer->led_mute.brightness_set = lenovo_led_brightness_set_tpkbd;
        data_pointer->led_mute.dev = dev;
-       led_classdev_register(dev, &data_pointer->led_mute);
+       ret = led_classdev_register(dev, &data_pointer->led_mute);
+       if (ret < 0)
+               goto err;
 
        data_pointer->led_micmute.name = name_micmute;
        data_pointer->led_micmute.brightness_get =
@@ -751,7 +753,11 @@ static int lenovo_probe_tpkbd(struct hid_device *hdev)
        data_pointer->led_micmute.brightness_set =
                lenovo_led_brightness_set_tpkbd;
        data_pointer->led_micmute.dev = dev;
-       led_classdev_register(dev, &data_pointer->led_micmute);
+       ret = led_classdev_register(dev, &data_pointer->led_micmute);
+       if (ret < 0) {
+               led_classdev_unregister(&data_pointer->led_mute);
+               goto err;
+       }
 
        lenovo_features_set_tpkbd(hdev);