Skip to contentSkip to conversation

HID: wacom: Fix wacom_probe error handling

PATCH In review Axel Lin 4 participants 4 messages Sep 17, 2012 – Sep 19, 2012 HID

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v2 1/1 HID: wacom: Fix wacom_probe error handling

OLEDs/LED are not critical for tablet functioning thus ignore OLED/LED initialisation failures.

This patch does clean up all the sysfs attribute files in error paths.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/hid/hid-wacom.c |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/hid/hid-wacom.c +14 -9
index a0fafac..2f60da9 100644
@@ -858,11 +858,9 @@ OLED_INIT(7);
 	if (hdev->product == USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) {
 		sprintf(hdev->name, "%s", "Wacom Intuos4 WL");
 		ret = wacom_initialize_leds(hdev);
-		if (ret) {
+		if (ret)
 			hid_warn(hdev,
 				 "can't create led attribute, err: %d\n", ret);
-			goto destroy_leds;
-		}
 	}
 
 	wdata->battery.properties = wacom_battery_props;

@@ -875,8 +873,8 @@ OLED_INIT(7);
 
 	ret = power_supply_register(&hdev->dev, &wdata->battery);
 	if (ret) {
-		hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n",
-			 ret);
+		hid_err(hdev, "can't create sysfs battery attribute, err: %d\n",
+			ret);
 		goto err_battery;
 	}
 

@@ -891,8 +889,8 @@ OLED_INIT(7);
 
 	ret = power_supply_register(&hdev->dev, &wdata->ac);
 	if (ret) {
-		hid_warn(hdev,
-			 "can't create ac battery attribute, err: %d\n", ret);
+		hid_err(hdev,
+			"can't create ac battery attribute, err: %d\n", ret);
 		goto err_ac;
 	}
 

@@ -902,10 +900,17 @@ OLED_INIT(7);
 err_ac:
 	power_supply_unregister(&wdata->battery);
 err_battery:
+	wacom_destroy_leds(hdev);
+	device_remove_file(&hdev->dev, &dev_attr_oled0_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled1_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled2_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled3_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled4_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled5_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled6_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled7_img);
 	device_remove_file(&hdev->dev, &dev_attr_speed);
 	hid_hw_stop(hdev);
-destroy_leds:
-	wacom_destroy_leds(hdev);
 err_free:
 	kfree(wdata);
 	return ret;
Signature · 1 line
1.7.9.5
#1 lore raw

If device_remove_file is needed for hid-wacom.c, it should be considered for wacm_sys.c as well.

Eduard, what do you think?

Ping

-----Original Message-----
From: Axel Lin [mailto:[email protected]]
Sent: Monday, September 17, 2012 1:54 AM
To: Jiri Kosina
Cc: Przemo Firszt; Ping Cheng; [email protected]
Subject: [PATCH v2] HID: wacom: Fix wacom_probe error handling

OLEDs/LED are not critical for tablet functioning thus ignore OLED/LED initialisation failures.

This patch does clean up all the sysfs attribute files in error paths.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/hid/hid-wacom.c |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/hid/hid-wacom.c +1 -3
@@ -858,11 +858,9 @@ OLED_INIT(7);
 	if (hdev->product == USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) {
 		sprintf(hdev->name, "%s", "Wacom Intuos4 WL");
 		ret = wacom_initialize_leds(hdev);
-		if (ret) {
+		if (ret)
 			hid_warn(hdev,
 				 "can't create led attribute, err: %d\n", ret);
-			goto destroy_leds;
-		}
 	}
 
 	wdata->battery.properties = wacom_battery_props; @@ -875,8 +873,8 @@ OLED_INIT(7);

ret = power_supply_register(&hdev->dev, &wdata->battery); if (ret) {
- hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n",
- ret);
+ hid_err(hdev, "can't create sysfs battery attribute, err: %d\n",
+ ret);
goto err_battery;
}

@@ -891,8 +889,8 @@ OLED_INIT(7);

ret = power_supply_register(&hdev->dev, &wdata->ac); if (ret) {
- hid_warn(hdev,
- "can't create ac battery attribute, err: %d\n", ret);
+ hid_err(hdev,
+ "can't create ac battery attribute, err: %d\n", ret);
goto err_ac;
}

@@ -902,10 +900,17 @@ OLED_INIT(7);
err_ac:
power_supply_unregister(&wdata->battery);
err_battery:
+ wacom_destroy_leds(hdev);
+ device_remove_file(&hdev->dev, &dev_attr_oled0_img);
+ device_remove_file(&hdev->dev, &dev_attr_oled1_img);
+ device_remove_file(&hdev->dev, &dev_attr_oled2_img);
+ device_remove_file(&hdev->dev, &dev_attr_oled3_img);
+ device_remove_file(&hdev->dev, &dev_attr_oled4_img);
+ device_remove_file(&hdev->dev, &dev_attr_oled5_img);
+ device_remove_file(&hdev->dev, &dev_attr_oled6_img);
+ device_remove_file(&hdev->dev, &dev_attr_oled7_img);
device_remove_file(&hdev->dev, &dev_attr_speed); hid_hw_stop(hdev);
-destroy_leds:
- wacom_destroy_leds(hdev);
err_free:
kfree(wdata);
return ret;
--
1.7.9.5

Tested-by on v2 1/1
#2 lore raw
In reply to Axel Lin
Quoted 59 lines · Axel Lin

OLEDs/LED are not critical for tablet functioning thus ignore OLED/LED initialisation failures.

This patch does clean up all the sysfs attribute files in error paths.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/hid/hid-wacom.c |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/hid/hid-wacom.c +11 -7
index a0fafac..2f60da9 100644
@@ -858,11 +858,9 @@ OLED_INIT(7);
 	if (hdev->product == USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) {
 		sprintf(hdev->name, "%s", "Wacom Intuos4 WL");
 		ret = wacom_initialize_leds(hdev);
-		if (ret) {
+		if (ret)
 			hid_warn(hdev,
 				 "can't create led attribute, err: %d\n", ret);
-			goto destroy_leds;
-		}
 	}
 
 	wdata->battery.properties = wacom_battery_props;

@@ -875,8 +873,8 @@ OLED_INIT(7);
 
 	ret = power_supply_register(&hdev->dev, &wdata->battery);
 	if (ret) {
-		hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n",
-			 ret);
+		hid_err(hdev, "can't create sysfs battery attribute, err: %d\n",
+			ret);
 		goto err_battery;
 	}
 

@@ -891,8 +889,8 @@ OLED_INIT(7);
 
 	ret = power_supply_register(&hdev->dev, &wdata->ac);
 	if (ret) {
-		hid_warn(hdev,
-			 "can't create ac battery attribute, err: %d\n", ret);
+		hid_err(hdev,
+			"can't create ac battery attribute, err: %d\n", ret);
 		goto err_ac;
 	}
 

@@ -902,10 +900,17 @@ OLED_INIT(7);
 err_ac:
 	power_supply_unregister(&wdata->battery);
 err_battery:
+	wacom_destroy_leds(hdev);
+	device_remove_file(&hdev->dev, &dev_attr_oled0_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled1_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled2_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled3_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled4_img);

drivers/hid/hid-wacom.c OLED_INIT(7); · line 916

Quoted 10 lines
drivers/hid/hid-wacom.c +3 -2
+	device_remove_file(&hdev->dev, &dev_attr_oled5_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled6_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled7_img);
 	device_remove_file(&hdev->dev, &dev_attr_speed);
 	hid_hw_stop(hdev);
-destroy_leds:
-	wacom_destroy_leds(hdev);
 err_free:
 	kfree(wdata);
 	return ret;
Tested-by Przemo Firszt <[email protected]>
#3 lore raw
Quoted 63 lines · Przemo Firszt
Quoted 63 lines

OLEDs/LED are not critical for tablet functioning thus ignore OLED/LED initialisation failures.

This patch does clean up all the sysfs attribute files in error paths.

Signed-off-by Axel Lin <[email protected]>
---
 drivers/hid/hid-wacom.c |   23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)
drivers/hid/hid-wacom.c +14 -7
index a0fafac..2f60da9 100644
@@ -858,11 +858,9 @@ OLED_INIT(7);
 	if (hdev->product == USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) {
 		sprintf(hdev->name, "%s", "Wacom Intuos4 WL");
 		ret = wacom_initialize_leds(hdev);
-		if (ret) {
+		if (ret)
 			hid_warn(hdev,
 				 "can't create led attribute, err: %d\n", ret);
-			goto destroy_leds;
-		}
 	}
 
 	wdata->battery.properties = wacom_battery_props;

@@ -875,8 +873,8 @@ OLED_INIT(7);
 
 	ret = power_supply_register(&hdev->dev, &wdata->battery);
 	if (ret) {
-		hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n",
-			 ret);
+		hid_err(hdev, "can't create sysfs battery attribute, err: %d\n",
+			ret);
 		goto err_battery;
 	}
 

@@ -891,8 +889,8 @@ OLED_INIT(7);
 
 	ret = power_supply_register(&hdev->dev, &wdata->ac);
 	if (ret) {
-		hid_warn(hdev,
-			 "can't create ac battery attribute, err: %d\n", ret);
+		hid_err(hdev,
+			"can't create ac battery attribute, err: %d\n", ret);
 		goto err_ac;
 	}
 

@@ -902,10 +900,17 @@ OLED_INIT(7);
 err_ac:
 	power_supply_unregister(&wdata->battery);
 err_battery:
+	wacom_destroy_leds(hdev);
+	device_remove_file(&hdev->dev, &dev_attr_oled0_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled1_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled2_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled3_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled4_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled5_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled6_img);
+	device_remove_file(&hdev->dev, &dev_attr_oled7_img);
 	device_remove_file(&hdev->dev, &dev_attr_speed);
Quoted 8 lines

drivers/hid/hid-wacom.c OLED_INIT(7); · line 916

Quoted 6 lines
drivers/hid/hid-wacom.c +0 -2
 	hid_hw_stop(hdev);
-destroy_leds:
-	wacom_destroy_leds(hdev);
 err_free:
 	kfree(wdata);
 	return ret;
Tested-by Przemo Firszt <[email protected]>

Thanks to both of you. Applied.

Signature · 2 lines
Jiri Kosina
SUSE Labs