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

tititiou36 · groeck · commit 35fe2ad259a3 · 2023-12-03T09:07:26.000-08:00
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: 82e3430 ("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>
diff --git 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",

Original file line number	Diff line number	Diff line change
`@@ -161,13 +161,13 @@ static int kraken2_probe(struct hid_device *hdev,`
`161`	`161`	`ret = hid_hw_start(hdev, HID_CONNECT_HIDRAW);`
`162`	`162`	`if (ret) {`
`163`	`163`	`hid_err(hdev, "hid hw start failed with %d\n", ret);`
`164`		`- goto fail_and_stop;`
	`164`	`+ return ret;`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`ret = hid_hw_open(hdev);`
`168`	`168`	`if (ret) {`
`169`	`169`	`hid_err(hdev, "hid hw open failed with %d\n", ret);`
`170`		`- goto fail_and_close;`
	`170`	`+ goto fail_and_stop;`
`171`	`171`	`}`
`172`	`172`
`173`	`173`	`priv->hwmon_dev = hwmon_device_register_with_info(&hdev->dev, "kraken2",`