Skip to content

Commit

Permalink
hwmon/applesmc: Handle name file creation error and deletion
Browse files Browse the repository at this point in the history
The previous patch was incomplete.

Signed-off-by: Nicolas Boichat <nicolas@boichat.ch>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
  • Loading branch information
Nicolas Boichat authored and Jean Delvare committed May 27, 2007
1 parent 548c343 commit 6996abf
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion drivers/hwmon/applesmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1206,11 +1206,13 @@ static int __init applesmc_init(void)
}

ret = sysfs_create_file(&pdev->dev.kobj, &dev_attr_name.attr);
if (ret)
goto out_device;

/* Create key enumeration sysfs files */
ret = sysfs_create_group(&pdev->dev.kobj, &key_enumeration_group);
if (ret)
goto out_device;
goto out_name;

/* create fan files */
count = applesmc_get_fan_count();
Expand Down Expand Up @@ -1310,6 +1312,8 @@ static int __init applesmc_init(void)
sysfs_remove_group(&pdev->dev.kobj, &fan_attribute_groups[1]);
out_key_enumeration:
sysfs_remove_group(&pdev->dev.kobj, &key_enumeration_group);
out_name:
sysfs_remove_file(&pdev->dev.kobj, &dev_attr_name.attr);
out_device:
platform_device_unregister(pdev);
out_driver:
Expand All @@ -1335,6 +1339,7 @@ static void __exit applesmc_exit(void)
sysfs_remove_group(&pdev->dev.kobj, &fan_attribute_groups[0]);
sysfs_remove_group(&pdev->dev.kobj, &fan_attribute_groups[1]);
sysfs_remove_group(&pdev->dev.kobj, &key_enumeration_group);
sysfs_remove_file(&pdev->dev.kobj, &dev_attr_name.attr);
platform_device_unregister(pdev);
platform_driver_unregister(&applesmc_driver);
release_region(APPLESMC_DATA_PORT, APPLESMC_NR_PORTS);
Expand Down

0 comments on commit 6996abf

Please sign in to comment.