--- v11
+++ v16
@@ -8,7 +8,7 @@
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/drivers/hid/hid-nintendo.c b/drivers/hid/hid-nintendo.c
-index 8e26672661dc..abac0497b1cb 100644
+index a000a287206e8..cda0118ebd14b 100644
--- a/drivers/hid/hid-nintendo.c
+++ b/drivers/hid/hid-nintendo.c
@@ -230,6 +230,7 @@ static const struct joycon_rumble_amp_data joycon_rumble_amplitudes[] = {
@@ -19,7 +19,7 @@
};
struct joycon_stick_cal {
-@@ -451,6 +452,14 @@ static int joycon_send_subcmd(struct joycon_ctlr *ctlr,
+@@ -458,6 +459,14 @@ static int joycon_send_subcmd(struct joycon_ctlr *ctlr,
unsigned long flags;
spin_lock_irqsave(&ctlr->lock, flags);
@@ -34,9 +34,9 @@
memcpy(subcmd->rumble_data, ctlr->rumble_data[ctlr->rumble_queue_tail],
JC_RUMBLE_DATA_SIZE);
spin_unlock_irqrestore(&ctlr->lock, flags);
-@@ -800,10 +809,13 @@ 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);
@@ -50,7 +50,7 @@
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)
-@@ -1516,9 +1528,17 @@ 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);
@@ -69,5 +69,5 @@
hid_hw_stop(hdev);
}
--
-2.25.1
+2.33.0