--- v12
+++ v13
@@ -9,7 +9,7 @@
1 file changed, 45 insertions(+)
diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
-index c2f7dc83d875..85870569cb49 100644
+index 2eee21f275c9d..c49ec001212bf 100644
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -319,6 +319,8 @@ struct joycon_ctlr {
@@ -30,7 +30,7 @@
input_set_drvdata(ctlr->input, ctlr);
@@ -1317,6 +1320,41 @@ static int joycon_power_supply_create(struct joycon_ctlr *ctlr)
- return 0;
+ return power_supply_powers(ctlr->battery, &hdev->dev);
}
+static int joycon_read_mac(struct joycon_ctlr *ctlr)
@@ -71,7 +71,7 @@
/* Common handler for parsing inputs */
static int joycon_ctlr_read_handler(struct joycon_ctlr *ctlr, u8 *data,
int size)
-@@ -1495,6 +1533,13 @@ static int nintendo_hid_probe(struct hid_device *hdev,
+@@ -1493,6 +1531,13 @@ static int nintendo_hid_probe(struct hid_device *hdev,
goto err_mutex;
}
@@ -79,12 +79,12 @@
+ if (ret) {
+ hid_err(hdev, "Failed to retrieve controller MAC; ret=%d\n",
+ ret);
-+ goto err_close;
++ goto err_mutex;
+ }
+
mutex_unlock(&ctlr->output_mutex);
/* Initialize the leds */
--
-2.28.0
+2.31.1