Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 210984
b: refs/heads/master
c: d172132
h: refs/heads/master
v: v3
  • Loading branch information
Jan Beulich authored and Guenter Roeck committed Sep 24, 2010
1 parent 13a8696 commit 21c61d5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d9bca4358286584cc22f4261ee3a60cad01aa4d4
refs/heads/master: d172132f358552eabd7a7410e478ffeead445243
5 changes: 4 additions & 1 deletion trunk/drivers/hwmon/pkgtemp.c
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ static int __devinit pkgtemp_probe(struct platform_device *pdev)

err = sysfs_create_group(&pdev->dev.kobj, &pkgtemp_group);
if (err)
goto exit_free;
goto exit_dev;

data->hwmon_dev = hwmon_device_register(&pdev->dev);
if (IS_ERR(data->hwmon_dev)) {
Expand All @@ -238,6 +238,8 @@ static int __devinit pkgtemp_probe(struct platform_device *pdev)

exit_class:
sysfs_remove_group(&pdev->dev.kobj, &pkgtemp_group);
exit_dev:
device_remove_file(&pdev->dev, &sensor_dev_attr_temp1_max.dev_attr);
exit_free:
kfree(data);
exit:
Expand All @@ -250,6 +252,7 @@ static int __devexit pkgtemp_remove(struct platform_device *pdev)

hwmon_device_unregister(data->hwmon_dev);
sysfs_remove_group(&pdev->dev.kobj, &pkgtemp_group);
device_remove_file(&pdev->dev, &sensor_dev_attr_temp1_max.dev_attr);
platform_set_drvdata(pdev, NULL);
kfree(data);
return 0;
Expand Down

0 comments on commit 21c61d5

Please sign in to comment.