Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 06:02:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

HID: wacom: Fix wacom_probe error handling

Browse Source 
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 <axel.lin@gmail.com>
Tested-by: Przemo Firszt <przemo@firszt.eu>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Axel Lin 2012-09-17 16:53:54 +08:00 committed by Jiri Kosina
parent e3c399ee4a
commit 8908dd8063
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/hid/hid-wacom.c
View File

@ -859,11 +859,9 @@ OLED_INIT(7);
if (hdev->product == USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) { if (hdev->product == USB_DEVICE_ID_WACOM_INTUOS4_BLUETOOTH) {
sprintf(hdev->name, "%s", "Wacom Intuos4 WL"); sprintf(hdev->name, "%s", "Wacom Intuos4 WL");
ret = wacom_initialize_leds(hdev); ret = wacom_initialize_leds(hdev);
if (ret) { if (ret)
hid_warn(hdev, hid_warn(hdev,
"can't create led attribute, err: %d\n", ret); "can't create led attribute, err: %d\n", ret);
goto destroy_leds;
}
} }
wdata->battery.properties = wacom_battery_props; wdata->battery.properties = wacom_battery_props;
@ -876,8 +874,8 @@ OLED_INIT(7);
ret = power_supply_register(&hdev->dev, &wdata->battery); ret = power_supply_register(&hdev->dev, &wdata->battery);
if (ret) { if (ret) {
hid_warn(hdev, "can't create sysfs battery attribute, err: %d\n", hid_err(hdev, "can't create sysfs battery attribute, err: %d\n",
ret); ret);
goto err_battery; goto err_battery;
} }
@ -892,8 +890,8 @@ OLED_INIT(7);
ret = power_supply_register(&hdev->dev, &wdata->ac); ret = power_supply_register(&hdev->dev, &wdata->ac);
if (ret) { if (ret) {
hid_warn(hdev, hid_err(hdev,
"can't create ac battery attribute, err: %d\n", ret); "can't create ac battery attribute, err: %d\n", ret);
goto err_ac; goto err_ac;
} }
@ -903,10 +901,17 @@ OLED_INIT(7);
err_ac: err_ac:
power_supply_unregister(&wdata->battery); power_supply_unregister(&wdata->battery);
err_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); device_remove_file(&hdev->dev, &dev_attr_speed);
hid_hw_stop(hdev); hid_hw_stop(hdev);
destroy_leds:
wacom_destroy_leds(hdev);
err_free: err_free:
kfree(wdata); kfree(wdata);
return ret; return ret;