Merge branch 'for-6.1/nintendo' into for-next

bentiss · bentiss · commit 0c33ef47248a · 2022-09-21T09:53:59.000+01:00
diff --git 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);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1904,9 +1904,8 @@ static int joycon_leds_create(struct joycon_ctlr *ctlr)`
`1904`	`1904`	`/* Set the home LED to 0 as default state */`
`1905`	`1905`	`ret = joycon_home_led_brightness_set(led, 0);`
`1906`	`1906`	`if (ret) {`
`1907`		`- hid_err(hdev, "Failed to set home LED dflt; ret=%d\n",`
`1908`		`- ret);`
`1909`		`- return ret;`
	`1907`	`+ hid_warn(hdev, "Failed to set home LED default, unregistering home LED");`
	`1908`	`+ devm_led_classdev_unregister(&hdev->dev, led);`
`1910`	`1909`	`}`
`1911`	`1910`	`}`
`1912`	`1911`