From 8b30fb40f8f2c5e56b7af553a398340f92d17aae Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Fri, 15 Apr 2022 18:04:32 +0800 Subject: [PATCH] HID: nintendo: deregister home LED when it fails Some Pro Controller compatible controllers do not support home LED, and will fail when setting it. Currently this leads to probe failure. Change the code that fails probing to deregistering home LED. Signed-off-by: Icenowy Zheng Reviewed-by: Daniel J. Ogorchock Reviewed-by: Silvan Jegen [bentiss: changed "dflt" to "default"] Signed-off-by: Benjamin Tissoires Link: https://lore.kernel.org/r/20220415100432.23453-1-icenowy@aosc.io --- drivers/hid/hid-nintendo.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c index 6028af3..5cb5a1d 100644 --- a/drivers/hid/hid-nintendo.c +++ b/drivers/hid/hid-nintendo.c @@ -1904,9 +1904,8 @@ static int joycon_leds_create(struct joycon_ctlr *ctlr) /* Set the home LED to 0 as default state */ ret = joycon_home_led_brightness_set(led, 0); if (ret) { - hid_err(hdev, "Failed to set home LED dflt; ret=%d\n", - ret); - return ret; + hid_warn(hdev, "Failed to set home LED default, unregistering home LED"); + devm_led_classdev_unregister(&hdev->dev, led); } } -- 2.7.4