diff options
| author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2023-09-18 04:54:30 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2023-10-04 20:57:56 +0200 |
| commit | 2ed20dec2a885dd8bea5af104b7bebc4ba5c9e72 (patch) | |
| tree | 16c48ef23d77d1b19daf7c5de2c4be6577e0cc2d | |
| parent | 29aa98d0fe013e2ab62aae4266231b7fb05d47a2 (diff) | |
| download | linux-2ed20dec2a885dd8bea5af104b7bebc4ba5c9e72.tar.gz linux-2ed20dec2a885dd8bea5af104b7bebc4ba5c9e72.tar.bz2 linux-2ed20dec2a885dd8bea5af104b7bebc4ba5c9e72.zip | |
HID: nvidia-shield: Fix a missing led_classdev_unregister() in the probe error handling path
The commit in Fixes updated the error handling path of
thunderstrike_create() and the remove function but not the error handling
path of shield_probe(), should an error occur after a successful
thunderstrike_create() call.
Add the missing call. Make sure it is safe to call in the probe error
handling path by preventing the led_classdev from attempting to set the LED
brightness to the off state on unregister.
Fixes: f88af60e74a5 ("HID: nvidia-shield: Support LED functionality for Thunderstrike")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | drivers/hid/hid-nvidia-shield.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-nvidia-shield.c b/drivers/hid/hid-nvidia-shield.c index 9a3576dbf421..c65a88dc3751 100644 --- a/drivers/hid/hid-nvidia-shield.c +++ b/drivers/hid/hid-nvidia-shield.c @@ -801,7 +801,7 @@ static inline int thunderstrike_led_create(struct thunderstrike *ts) led->name = devm_kasprintf(&ts->base.hdev->dev, GFP_KERNEL, "thunderstrike%d:blue:led", ts->id); led->max_brightness = 1; - led->flags = LED_CORE_SUSPENDRESUME; + led->flags = LED_CORE_SUSPENDRESUME | LED_RETAIN_AT_SHUTDOWN; led->brightness_get = &thunderstrike_led_get_brightness; led->brightness_set = &thunderstrike_led_set_brightness; @@ -1076,6 +1076,7 @@ err_stop: err_haptics: if (ts->haptics_dev) input_unregister_device(ts->haptics_dev); + led_classdev_unregister(&ts->led_dev); return ret; } |