Re: [PATCH v3 04/14] HID: logitech-hidpp: disable works before stopping transport
From: Dmitry Torokhov
Date: Fri Nov 20 2026 - 13:09:00 EST
On Fri, Nov 20, 2026 at 02:51:29PM +0100, Jiri Kosina wrote:
> On Fri, 20 Nov 2026, Dmitry Torokhov wrote:
>
> > Device removal and the probe error unwind path cancel the connect-event
> > and hi-res-reset work items only after closing and stopping the HID
> > transport, leaving in-flight work handlers able to issue HID++ transfers
> > or register power-supply and input devices while transport teardown is
> > underway. Moving cancel_work_sync() ahead of transport shutdown is not
> > sufficient because incoming reports remain active until the transport
> > stops and can re-schedule the work items before hid_hw_stop() completes.
> >
> > Disable both work items synchronously before closing or stopping the
> > HID transport on device removal and on the post-I/O probe failure path,
> > and drop the unreachable cancellations from early transport start and
> > open failure paths where incoming packets have not been enabled yet.
> >
> > On device removal where HID core enters with device I/O stopped and
> > driver_input_lock held, temporarily re-enable device I/O to flush
> > pending work handlers and disconnect input devices before stopping the
> > transport. Clear HID_CLAIMED_INPUT and hidpp->input upfront so incoming
> > reports can still wake synchronous commands without dispatching events
> > to the disconnecting input device.
> >
> > Fixes: 7bfd2927adca ("HID: hid-logitech-hidpp: Add basic support for Logitech G920")
> > Fixes: ed80cc4667ac ("HID: logitech-hidpp: Add HIDPP_QUIRK_RESET_HI_RES_SCROLL")
> > Tested-by: Gideon Heinz <gideonheinz02@xxxxxxxxx>
> > Cc: stable@xxxxxxxxxxxxxxx
> > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
> > ---
> > drivers/hid/hid-logitech-hidpp.c | 19 +++++++++++++++----
> > 1 file changed, 15 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
> > index d5f53b35ac6f..0e1a9fd98faf 100644
> > --- a/drivers/hid/hid-logitech-hidpp.c
> > +++ b/drivers/hid/hid-logitech-hidpp.c
> > @@ -4805,13 +4805,13 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
> > return ret;
> >
> > hid_hw_init_fail:
> > + disable_work_sync(&hidpp->work);
> > + disable_work_sync(&hidpp->reset_hi_res_work);
> > hid_hw_close(hdev);
> > hid_hw_open_fail:
> > hid_hw_stop(hdev);
> > hid_hw_start_fail:
> > sysfs_remove_group(&hdev->dev.kobj, &ps_attribute_group);
> > - cancel_work_sync(&hidpp->work);
> > - cancel_work_sync(&hidpp->reset_hi_res_work);
> > mutex_destroy(&hidpp->send_mutex);
> > return ret;
> > }
> > @@ -4819,15 +4819,26 @@ static int hidpp_probe(struct hid_device *hdev, const struct hid_device_id *id)
> > static void hidpp_remove(struct hid_device *hdev)
> > {
> > struct hidpp_device *hidpp = hid_get_drvdata(hdev);
> > + bool claimed_input;
> >
> > if (!hidpp)
> > return hid_hw_stop(hdev);
> >
> > sysfs_remove_group(&hdev->dev.kobj, &ps_attribute_group);
> >
> > + claimed_input = hdev->claimed & HID_CLAIMED_INPUT;
> > + hdev->claimed &= ~HID_CLAIMED_INPUT;
> > + if (claimed_input)
> > + hidpp->input = NULL;
> > +
> > + hid_device_io_start(hdev);
> > + disable_work_sync(&hidpp->work);
> > + disable_work_sync(&hidpp->reset_hi_res_work);
> > + if (claimed_input)
> > + hidinput_disconnect(hdev);
>
> This fails to build, because hidinput_disconnect is defined in hid-core
> and there is no declaration for it in logitech code.
>
> I'll drop this series for now, please fix it and resubmit a version that
> compiles :))
Ah, yes, I un-exported it in my hidraw cleanup patch series that you
just applied.
Hoisted by my own petard ;)
I guess we need to re-export it now that there is a valid (IMO) use case
to have it available outside of the hid core.
Thanks.
--
Dmitry