From ca264b1df23de483b370e5f1abc16933e27eea0a Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 11:20:21 -0700 Subject: [PATCH] --- yaml --- r: 326181 b: refs/heads/master c: 9220f1e4a284667a813ca4428fbbd5a3cbc6295d h: refs/heads/master i: 326179: 441d43e578c53add29ac73ace195a96da9c336b1 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/sch5636.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index edf6d214bf79..7a1dea86f864 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd8d8e088d4ec8738d47141c119013b5e63f591c +refs/heads/master: 9220f1e4a284667a813ca4428fbbd5a3cbc6295d diff --git a/trunk/drivers/hwmon/sch5636.c b/trunk/drivers/hwmon/sch5636.c index 96a7e68718ca..517118016192 100644 --- a/trunk/drivers/hwmon/sch5636.c +++ b/trunk/drivers/hwmon/sch5636.c @@ -402,9 +402,6 @@ static int sch5636_remove(struct platform_device *pdev) device_remove_file(&pdev->dev, &sch5636_fan_attr[i].dev_attr); - platform_set_drvdata(pdev, NULL); - kfree(data); - return 0; } @@ -414,7 +411,8 @@ static int __devinit sch5636_probe(struct platform_device *pdev) int i, err, val, revision[2]; char id[4]; - data = kzalloc(sizeof(struct sch5636_data), GFP_KERNEL); + data = devm_kzalloc(&pdev->dev, sizeof(struct sch5636_data), + GFP_KERNEL); if (!data) return -ENOMEM;