--- v7
+++ v16
@@ -4,36 +4,22 @@
 
 Signed-off-by: Daniel J. Ogorchock <djogorchock@gmail.com>
 ---
- drivers/hid/hid-nintendo.c | 26 +++++++++++++++++++++++---
- 1 file changed, 23 insertions(+), 3 deletions(-)
+ drivers/hid/hid-nintendo.c | 24 ++++++++++++++++++++++--
+ 1 file changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
-index 0c6fe135c750..3042ef5a54e1 100644
+index a000a287206e8..cda0118ebd14b 100644
 --- a/drivers/hid/hid-nintendo.c
 +++ b/drivers/hid/hid-nintendo.c
-@@ -324,6 +324,7 @@ struct joycon_ctlr {
- 	u8 usb_ack_match;
- 	u8 subcmd_ack_match;
- 	bool received_input_report;
-+	bool ctlr_removed;
+@@ -230,6 +230,7 @@ static const struct joycon_rumble_amp_data joycon_rumble_amplitudes[] = {
+ enum joycon_ctlr_state {
+ 	JOYCON_CTLR_STATE_INIT,
+ 	JOYCON_CTLR_STATE_READ,
++	JOYCON_CTLR_STATE_REMOVED,
+ };
  
- 	/* factory calibration data */
- 	struct joycon_stick_cal left_stick_cal_x;
-@@ -390,10 +391,12 @@ static int joycon_hid_send_sync(struct joycon_ctlr *ctlr, u8 *data, size_t len,
- 			ret = wait_event_timeout(ctlr->wait,
- 						 ctlr->received_input_report,
- 						 HZ / 4);
-+			spin_lock_irqsave(&ctlr->lock, flags);
- 			/* We will still proceed, even with a timeout here */
--			if (!ret)
-+			if (!ret && !ctlr->ctlr_removed)
- 				hid_warn(ctlr->hdev,
- 					 "timeout waiting for input report\n");
-+			spin_unlock_irqrestore(&ctlr->lock, flags);
- 		}
- 
- 		ret = __joycon_hid_send(ctlr->hdev, data, len);
-@@ -445,6 +448,14 @@ static int joycon_send_subcmd(struct joycon_ctlr *ctlr,
+ struct joycon_stick_cal {
+@@ -458,6 +459,14 @@ static int joycon_send_subcmd(struct joycon_ctlr *ctlr,
  	unsigned long flags;
  
  	spin_lock_irqsave(&ctlr->lock, flags);
@@ -41,29 +27,30 @@
 +	 * If the controller has been removed, just return ENODEV so the LED
 +	 * subsystem doesn't print invalid errors on removal.
 +	 */
-+	if (ctlr->ctlr_removed) {
++	if (ctlr->ctlr_state == JOYCON_CTLR_STATE_REMOVED) {
 +		spin_unlock_irqrestore(&ctlr->lock, flags);
 +		return -ENODEV;
 +	}
  	memcpy(subcmd->rumble_data, ctlr->rumble_data[ctlr->rumble_queue_tail],
  	       JC_RUMBLE_DATA_SIZE);
  	spin_unlock_irqrestore(&ctlr->lock, flags);
-@@ -772,10 +783,12 @@ static void joycon_rumble_worker(struct work_struct *work)
+@@ -807,10 +816,13 @@ static void joycon_rumble_worker(struct work_struct *work)
  		mutex_lock(&ctlr->output_mutex);
- 		ret = joycon_enable_rumble(ctlr, true);
+ 		ret = joycon_enable_rumble(ctlr);
  		mutex_unlock(&ctlr->output_mutex);
 -		if (ret < 0)
 -			hid_warn(ctlr->hdev, "Failed to set rumble; e=%d", ret);
  
 +		/* -ENODEV means the controller was just unplugged */
  		spin_lock_irqsave(&ctlr->lock, flags);
-+		if (ret < 0 && ret != -ENODEV && !ctlr->ctlr_removed)
++		if (ret < 0 && ret != -ENODEV &&
++		    ctlr->ctlr_state != JOYCON_CTLR_STATE_REMOVED)
 +			hid_warn(ctlr->hdev, "Failed to set rumble; e=%d", ret);
 +
  		ctlr->rumble_msecs = jiffies_to_msecs(jiffies);
  		if (ctlr->rumble_queue_tail != ctlr->rumble_queue_head) {
  			if (++ctlr->rumble_queue_tail >= JC_RUMBLE_QUEUE_SIZE)
-@@ -1443,8 +1456,15 @@ static int nintendo_hid_probe(struct hid_device *hdev,
+@@ -1520,9 +1532,17 @@ static int nintendo_hid_probe(struct hid_device *hdev,
  static void nintendo_hid_remove(struct hid_device *hdev)
  {
  	struct joycon_ctlr *ctlr = hid_get_drvdata(hdev);
@@ -73,12 +60,14 @@
 +
 +	/* Prevent further attempts at sending subcommands. */
 +	spin_lock_irqsave(&ctlr->lock, flags);
-+	ctlr->ctlr_removed = true;
++	ctlr->ctlr_state = JOYCON_CTLR_STATE_REMOVED;
 +	spin_unlock_irqrestore(&ctlr->lock, flags);
++
+ 	destroy_workqueue(ctlr->rumble_queue);
 +
  	hid_hw_close(hdev);
  	hid_hw_stop(hdev);
  }
 -- 
-2.23.0
+2.33.0