---

yaml --- r: 315967 b: refs/heads/master c: e7d5bf7 h: refs/heads/master i: 315965: f956ef4 315963: 0e88d12 315959: 38a3384 315951: 8f6312f 315935: 1be0474 315903: 4d9d6a2 v: v3
git-mirror · Jul 22, 2012 · c822396 · c822396
1 parent 6bf762e
commit c822396
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e41f6432d1ca757d8e4a2dccfd772e421d640e98
+refs/heads/master: e7d5bf7ed59ce26d3e6fc12ada497f42efd393ef
diff --git a/trunk/drivers/hwmon/wm831x-hwmon.c b/trunk/drivers/hwmon/wm831x-hwmon.c
@@ -163,15 +163,16 @@ static int __devinit wm831x_hwmon_probe(struct platform_device *pdev)
 	struct wm831x_hwmon *hwmon;
 	int ret;
 
-	hwmon = kzalloc(sizeof(struct wm831x_hwmon), GFP_KERNEL);
+	hwmon = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_hwmon),
+			     GFP_KERNEL);
 	if (!hwmon)
 		return -ENOMEM;
 
 	hwmon->wm831x = wm831x;
 
 	ret = sysfs_create_group(&pdev->dev.kobj, &wm831x_attr_group);
 	if (ret)
-		goto err;
+		return ret;
 
 	hwmon->classdev = hwmon_device_register(&pdev->dev);
 	if (IS_ERR(hwmon->classdev)) {
@@ -185,8 +186,6 @@ static int __devinit wm831x_hwmon_probe(struct platform_device *pdev)
 
 err_sysfs:
 	sysfs_remove_group(&pdev->dev.kobj, &wm831x_attr_group);
-err:
-	kfree(hwmon);
 	return ret;
 }
 
@@ -196,8 +195,6 @@ static int __devexit wm831x_hwmon_remove(struct platform_device *pdev)
 
 	hwmon_device_unregister(hwmon->classdev);
 	sysfs_remove_group(&pdev->dev.kobj, &wm831x_attr_group);
-	platform_set_drvdata(pdev, NULL);
-	kfree(hwmon);
 
 	return 0;
 }