hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hwmon: (nzxt-kraken2) Fix error handling path in kraken2_probe() 

[ Upstream commit 35fe2ad259 ]

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: 82e3430dfa ("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>
Link: https://lore.kernel.org/r/a768e69851a07a1f4e29f270f4e2559063f07343.1701617030.git.christophe.jaillet@wanadoo.fr
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe JAILLET 2023-12-03 16:24:05 +01:00 committed by Greg Kroah-Hartman
parent 3baaba7908
commit 2358e53208
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/hwmon/nzxt-kraken2.c
View File

@ -161,13 +161,13 @@ static int kraken2_probe(struct hid_device *hdev,
ret = hid_hw_start(hdev, HID_CONNECT_HIDRAW); ret = hid_hw_start(hdev, HID_CONNECT_HIDRAW);
if (ret) { if (ret) {
hid_err(hdev, "hid hw start failed with %d\n", ret); hid_err(hdev, "hid hw start failed with %d\n", ret);
goto fail_and_stop; return ret;
} }
ret = hid_hw_open(hdev); ret = hid_hw_open(hdev);
if (ret) { if (ret) {
hid_err(hdev, "hid hw open failed with %d\n", 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", priv->hwmon_dev = hwmon_device_register_with_info(&hdev->dev, "kraken2",