Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 326181
b: refs/heads/master
c: 9220f1e
h: refs/heads/master
i:
  326179: 441d43e
v: v3
  • Loading branch information
Guenter Roeck committed Sep 24, 2012
1 parent e680722 commit ca264b1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 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: bd8d8e088d4ec8738d47141c119013b5e63f591c
refs/heads/master: 9220f1e4a284667a813ca4428fbbd5a3cbc6295d
6 changes: 2 additions & 4 deletions trunk/drivers/hwmon/sch5636.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;

Expand Down

0 comments on commit ca264b1

Please sign in to comment.