--- v16
+++ v13
@@ -9,10 +9,10 @@
  1 file changed, 45 insertions(+)
 
 diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
-index ed9cf7b373067..ac171ee5066ad 100644
+index 2eee21f275c9d..c49ec001212bf 100644
 --- a/drivers/hid/hid-nintendo.c
 +++ b/drivers/hid/hid-nintendo.c
-@@ -326,6 +326,8 @@ struct joycon_ctlr {
+@@ -319,6 +319,8 @@ struct joycon_ctlr {
  	struct led_classdev home_led;
  	enum joycon_ctlr_state ctlr_state;
  	spinlock_t lock;
@@ -21,7 +21,7 @@
  
  	/* The following members are used for synchronous sends/receives */
  	enum joycon_msg_type msg_type;
-@@ -1012,6 +1014,7 @@ static int joycon_input_create(struct joycon_ctlr *ctlr)
+@@ -1005,6 +1007,7 @@ static int joycon_input_create(struct joycon_ctlr *ctlr)
  	ctlr->input->id.vendor = hdev->vendor;
  	ctlr->input->id.product = hdev->product;
  	ctlr->input->id.version = hdev->version;
@@ -29,7 +29,7 @@
  	ctlr->input->name = name;
  	input_set_drvdata(ctlr->input, ctlr);
  
-@@ -1322,6 +1325,41 @@ static int joycon_power_supply_create(struct joycon_ctlr *ctlr)
+@@ -1317,6 +1320,41 @@ static int joycon_power_supply_create(struct joycon_ctlr *ctlr)
  	return power_supply_powers(ctlr->battery, &hdev->dev);
  }
  
@@ -71,7 +71,7 @@
  /* Common handler for parsing inputs */
  static int joycon_ctlr_read_handler(struct joycon_ctlr *ctlr, u8 *data,
  							      int size)
-@@ -1498,6 +1536,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;
  	}
  
@@ -86,5 +86,5 @@
  
  	/* Initialize the leds */
 -- 
-2.33.0
+2.31.1