From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 10 Nov 2021 08:12:08 +0000 (+0300)
Subject: HID: nintendo: unlock on error in joycon_leds_create()
X-Git-Tag: v5.16-rc3~43^2~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=304dd3680b56a2a5c8eaff41bcf1a3e49adf7dfc;p=thirdparty%2Flinux.git

HID: nintendo: unlock on error in joycon_leds_create()

These two error paths need to drop the lock before returning.

Fixes: c5e626769563 ("HID: nintendo: add player led support")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---

diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
index a1e0f6849875e..7e1d1127493ed 100644
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -1850,8 +1850,10 @@ static int joycon_leds_create(struct joycon_ctlr *ctlr)
 				      d_name,
 				      "green",
 				      joycon_player_led_names[i]);
-		if (!name)
+		if (!name) {
+			mutex_unlock(&joycon_input_num_mutex);
 			return -ENOMEM;
+		}
 
 		led = &ctlr->leds[i];
 		led->name = name;
@@ -1864,6 +1866,7 @@ static int joycon_leds_create(struct joycon_ctlr *ctlr)
 		ret = devm_led_classdev_register(&hdev->dev, led);
 		if (ret) {
 			hid_err(hdev, "Failed registering %s LED\n", led->name);
+			mutex_unlock(&joycon_input_num_mutex);
 			return ret;
 		}
 	}