|
@@ -288,7 +288,7 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev)
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
|
|
|
- hwmon = kzalloc(sizeof(struct s3c_hwmon), GFP_KERNEL);
|
|
|
+ hwmon = devm_kzalloc(&dev->dev, sizeof(struct s3c_hwmon), GFP_KERNEL);
|
|
|
if (hwmon == NULL) {
|
|
|
dev_err(&dev->dev, "no memory\n");
|
|
|
return -ENOMEM;
|
|
@@ -303,8 +303,7 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev)
|
|
|
hwmon->client = s3c_adc_register(dev, NULL, NULL, 0);
|
|
|
if (IS_ERR(hwmon->client)) {
|
|
|
dev_err(&dev->dev, "cannot register adc\n");
|
|
|
- ret = PTR_ERR(hwmon->client);
|
|
|
- goto err_mem;
|
|
|
+ return PTR_ERR(hwmon->client);
|
|
|
}
|
|
|
|
|
|
/* add attributes for our adc devices. */
|
|
@@ -363,8 +362,6 @@ static int __devinit s3c_hwmon_probe(struct platform_device *dev)
|
|
|
err_registered:
|
|
|
s3c_adc_release(hwmon->client);
|
|
|
|
|
|
- err_mem:
|
|
|
- kfree(hwmon);
|
|
|
return ret;
|
|
|
}
|
|
|
|