From 468c8ff17c1e7032b692ebffbfbc7f894752da62 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Mon, 23 Apr 2012 10:39:00 -0700 Subject: [PATCH] --- yaml --- r: 305859 b: refs/heads/master c: 41141e64e63dd250a05218b66c91e125f1020b92 h: refs/heads/master i: 305857: 28b9d922d8b8bca51cd28da5a8524e14cb847af3 305855: 9128122ccb9a5302815a4254e28b1d661c93d3b6 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/ntc_thermistor.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 25ece07ce525..d3db9757017c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1137a9a649db818869905b010b120a95a01b0d24 +refs/heads/master: 41141e64e63dd250a05218b66c91e125f1020b92 diff --git a/trunk/drivers/hwmon/ntc_thermistor.c b/trunk/drivers/hwmon/ntc_thermistor.c index 9b382ec2c3bd..4be7faff321b 100644 --- a/trunk/drivers/hwmon/ntc_thermistor.c +++ b/trunk/drivers/hwmon/ntc_thermistor.c @@ -349,7 +349,7 @@ static int __devinit ntc_thermistor_probe(struct platform_device *pdev) return -EINVAL; } - data = kzalloc(sizeof(struct ntc_data), GFP_KERNEL); + data = devm_kzalloc(&pdev->dev, sizeof(struct ntc_data), GFP_KERNEL); if (!data) return -ENOMEM; @@ -370,8 +370,7 @@ static int __devinit ntc_thermistor_probe(struct platform_device *pdev) dev_err(&pdev->dev, "Unknown device type: %lu(%s)\n", pdev->id_entry->driver_data, pdev->id_entry->name); - ret = -EINVAL; - goto err; + return -EINVAL; } platform_set_drvdata(pdev, data); @@ -379,7 +378,7 @@ static int __devinit ntc_thermistor_probe(struct platform_device *pdev) ret = sysfs_create_group(&data->dev->kobj, &ntc_attr_group); if (ret) { dev_err(data->dev, "unable to create sysfs files\n"); - goto err; + return ret; } data->hwmon_dev = hwmon_device_register(data->dev); @@ -395,8 +394,6 @@ static int __devinit ntc_thermistor_probe(struct platform_device *pdev) return 0; err_after_sysfs: sysfs_remove_group(&data->dev->kobj, &ntc_attr_group); -err: - kfree(data); return ret; } @@ -408,8 +405,6 @@ static int __devexit ntc_thermistor_remove(struct platform_device *pdev) sysfs_remove_group(&data->dev->kobj, &ntc_attr_group); platform_set_drvdata(pdev, NULL); - kfree(data); - return 0; }