| From 3d2af0d8a7b04c3db28360a1736872afa4b07d81 Mon Sep 17 00:00:00 2001 |
| From: Aditya Pakki <pakki001@umn.edu> |
| Date: Mon, 24 Dec 2018 15:39:14 -0600 |
| Subject: HID: lenovo: Add checks to fix of_led_classdev_register |
| |
| [ 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> |
| --- |
| drivers/hid/hid-lenovo.c | 10 ++++++++-- |
| 1 file changed, 8 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/hid/hid-lenovo.c b/drivers/hid/hid-lenovo.c |
| index 643b6eb54442..eacc76d2ab96 100644 |
| --- a/drivers/hid/hid-lenovo.c |
| +++ b/drivers/hid/hid-lenovo.c |
| @@ -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); |
| |
| -- |
| 2.19.1 |
| |
