]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
HID: nintendo: Wait longer for initial probe
authorVicki Pfau <vi@endrift.com>
Tue, 7 Oct 2025 01:05:32 +0000 (18:05 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 24 Nov 2025 09:35:47 +0000 (10:35 +0100)
[ Upstream commit b73bc6a51f0c0066912c7e181acee41091c70fe6 ]

Some third-party controllers, such as the PB Tails CHOC, won't always
respond quickly on startup. Since this packet is needed for probe, and only
once during probe, let's just wait an extra second, which makes connecting
consistent.

Signed-off-by: Vicki Pfau <vi@endrift.com>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/hid/hid-nintendo.c

index 2a3ae1068739d63fe090cd078f2ad4774af751cd..6bdc9165f82262fee04b3535b6fac3a8d741ca2f 100644 (file)
@@ -2424,7 +2424,7 @@ static int joycon_read_info(struct joycon_ctlr *ctlr)
        struct joycon_input_report *report;
 
        req.subcmd_id = JC_SUBCMD_REQ_DEV_INFO;
-       ret = joycon_send_subcmd(ctlr, &req, 0, HZ);
+       ret = joycon_send_subcmd(ctlr, &req, 0, 2 * HZ);
        if (ret) {
                hid_err(ctlr->hdev, "Failed to get joycon info; ret=%d\n", ret);
                return ret;