diff --git a/[refs] b/[refs] index 8f10800339f8..edf6d214bf79 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79831fd4e0820bdc882d08707e4650ed4dfff3b8 +refs/heads/master: bd8d8e088d4ec8738d47141c119013b5e63f591c diff --git a/trunk/drivers/hwmon/sch5627.c b/trunk/drivers/hwmon/sch5627.c index 8342275378b8..49f6230bdcf1 100644 --- a/trunk/drivers/hwmon/sch5627.c +++ b/trunk/drivers/hwmon/sch5627.c @@ -461,8 +461,6 @@ static int sch5627_remove(struct platform_device *pdev) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&pdev->dev.kobj, &sch5627_group); - platform_set_drvdata(pdev, NULL); - kfree(data); return 0; } @@ -472,7 +470,8 @@ static int __devinit sch5627_probe(struct platform_device *pdev) struct sch5627_data *data; int err, build_code, build_id, hwmon_rev, val; - data = kzalloc(sizeof(struct sch5627_data), GFP_KERNEL); + data = devm_kzalloc(&pdev->dev, sizeof(struct sch5627_data), + GFP_KERNEL); if (!data) return -ENOMEM;