| Message ID | 20220812025515.19467-1-hbh25y@gmail.com |
|---|---|
| State | Accepted |
| Commit | 98d67f250472cdd0f8d083830be3ec9dbb0c65a8 |
| Headers | show |
| Series | hid: hid-logitech-hidpp: avoid unnecessary assignments in hidpp_connect_event | expand |
On 12/8/2022 10:55, Hangyu Hua wrote: > hidpp->delayed_input can't be assigned to an object that already call > input_free_device when input_register_device fails. > > Fixes: c39e3d5fc9dd ("HID: logitech-hidpp: late bind the input device on wireless connection") > Signed-off-by: Hangyu Hua <hbh25y@gmail.com> > --- > drivers/hid/hid-logitech-hidpp.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c > index 68f9e9d207f4..c3602bf8f9b9 100644 > --- a/drivers/hid/hid-logitech-hidpp.c > +++ b/drivers/hid/hid-logitech-hidpp.c > @@ -3959,8 +3959,10 @@ static void hidpp_connect_event(struct hidpp_device *hidpp) > hidpp_populate_input(hidpp, input); > > ret = input_register_device(input); > - if (ret) > + if (ret) { > input_free_device(input); > + return; > + } > > hidpp->delayed_input = input; > } Gentel ping.
On Tue, Sep 6, 2022 at 9:57 AM Hangyu Hua <hbh25y@gmail.com> wrote: > > On 12/8/2022 10:55, Hangyu Hua wrote: > > hidpp->delayed_input can't be assigned to an object that already call > > input_free_device when input_register_device fails. > > > > Fixes: c39e3d5fc9dd ("HID: logitech-hidpp: late bind the input device on wireless connection") > > Signed-off-by: Hangyu Hua <hbh25y@gmail.com> > > --- > > drivers/hid/hid-logitech-hidpp.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c > > index 68f9e9d207f4..c3602bf8f9b9 100644 > > --- a/drivers/hid/hid-logitech-hidpp.c > > +++ b/drivers/hid/hid-logitech-hidpp.c > > @@ -3959,8 +3959,10 @@ static void hidpp_connect_event(struct hidpp_device *hidpp) > > hidpp_populate_input(hidpp, input); > > > > ret = input_register_device(input); > > - if (ret) > > + if (ret) { > > input_free_device(input); > > + return; > > + } > > > > hidpp->delayed_input = input; > > } > Gentel ping. > Applied to for-6.1/logitech in hid.git Sorry for the delay Cheers, Benjamin
diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c index 68f9e9d207f4..c3602bf8f9b9 100644 --- a/drivers/hid/hid-logitech-hidpp.c +++ b/drivers/hid/hid-logitech-hidpp.c @@ -3959,8 +3959,10 @@ static void hidpp_connect_event(struct hidpp_device *hidpp) hidpp_populate_input(hidpp, input); ret = input_register_device(input); - if (ret) + if (ret) { input_free_device(input); + return; + } hidpp->delayed_input = input; }
hidpp->delayed_input can't be assigned to an object that already call input_free_device when input_register_device fails. Fixes: c39e3d5fc9dd ("HID: logitech-hidpp: late bind the input device on wireless connection") Signed-off-by: Hangyu Hua <hbh25y@gmail.com> --- drivers/hid/hid-logitech-hidpp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)