| Message ID | a768e69851a07a1f4e29f270f4e2559063f07343.1701617030.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | hwmon: nzxt: Fix some error handling path in kraken2_probe() | expand |
On Sun, Dec 03, 2023 at 04:24:05PM +0100, Christophe JAILLET wrote: > There is no point in calling hid_hw_stop() if hid_hw_start() has failed. > There is no point in calling hid_hw_close() if hid_hw_open() has failed. > > Update the error handling path accordingly. > > Fixes: 82e3430dfa8c ("hwmon: add driver for NZXT Kraken X42/X52/X62/X72") > Reported-by: Aleksa Savic <savicaleksa83@gmail.com> > Closes: https://lore.kernel.org/all/121470f0-6c1f-418a-844c-7ec2e8a54b8e@gmail.com/ > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > Closes added to please checkpatch, not sure if relevant here. > --- > drivers/hwmon/nzxt-kraken2.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/hwmon/nzxt-kraken2.c b/drivers/hwmon/nzxt-kraken2.c > index 428c77b5fce5..7caf387eb144 100644 > --- a/drivers/hwmon/nzxt-kraken2.c > +++ b/drivers/hwmon/nzxt-kraken2.c > @@ -161,13 +161,13 @@ static int kraken2_probe(struct hid_device *hdev, > ret = hid_hw_start(hdev, HID_CONNECT_HIDRAW); > if (ret) { > hid_err(hdev, "hid hw start failed with %d\n", ret); > - goto fail_and_stop; > + return ret; > } > > ret = hid_hw_open(hdev); > if (ret) { > hid_err(hdev, "hid hw open failed with %d\n", ret); > - goto fail_and_close; > + goto fail_and_stop; > } > > priv->hwmon_dev = hwmon_device_register_with_info(&hdev->dev, "kraken2", > -- > 2.34.1 > That was a silly mistake from me. Thanks for finding and fixing it. Reviewed-by: Jonas Malaco <jonas@protocubo.io>
On Sun, Dec 03, 2023 at 04:24:05PM +0100, Christophe JAILLET wrote: > There is no point in calling hid_hw_stop() if hid_hw_start() has failed. > There is no point in calling hid_hw_close() if hid_hw_open() has failed. > > Update the error handling path accordingly. > > Fixes: 82e3430dfa8c ("hwmon: add driver for NZXT Kraken X42/X52/X62/X72") > Reported-by: Aleksa Savic <savicaleksa83@gmail.com> > Closes: https://lore.kernel.org/all/121470f0-6c1f-418a-844c-7ec2e8a54b8e@gmail.com/ > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > Reviewed-by: Jonas Malaco <jonas@protocubo.io> Applied. > --- > Closes added to please checkpatch, not sure if relevant here. One of the few checkpatch warnings which may be ignored for hwmon patches. Sometimes there _is_ no report of a problem or, like in this case, it is reported in some unrelated exchange. I don't drop it if provided, but I don't require it either. Guenter
diff --git a/drivers/hwmon/nzxt-kraken2.c b/drivers/hwmon/nzxt-kraken2.c index 428c77b5fce5..7caf387eb144 100644 --- a/drivers/hwmon/nzxt-kraken2.c +++ b/drivers/hwmon/nzxt-kraken2.c @@ -161,13 +161,13 @@ static int kraken2_probe(struct hid_device *hdev, ret = hid_hw_start(hdev, HID_CONNECT_HIDRAW); if (ret) { hid_err(hdev, "hid hw start failed with %d\n", ret); - goto fail_and_stop; + return ret; } ret = hid_hw_open(hdev); if (ret) { hid_err(hdev, "hid hw open failed with %d\n", ret); - goto fail_and_close; + goto fail_and_stop; } priv->hwmon_dev = hwmon_device_register_with_info(&hdev->dev, "kraken2",
There is no point in calling hid_hw_stop() if hid_hw_start() has failed. There is no point in calling hid_hw_close() if hid_hw_open() has failed. Update the error handling path accordingly. Fixes: 82e3430dfa8c ("hwmon: add driver for NZXT Kraken X42/X52/X62/X72") Reported-by: Aleksa Savic <savicaleksa83@gmail.com> Closes: https://lore.kernel.org/all/121470f0-6c1f-418a-844c-7ec2e8a54b8e@gmail.com/ Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- Closes added to please checkpatch, not sure if relevant here. --- drivers/hwmon/nzxt-kraken2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)