From 427c10b0cd41cf360ca2f78f62ee1692ce721b8c Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 09:58:13 -0700 Subject: [PATCH] --- yaml --- r: 316000 b: refs/heads/master c: 96f316c24c0aea2984c90170966d9a2cb93d1094 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/max6642.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 052139b128ee..0c27b89890ee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 215690a4f1050cdf3267e72e2d8c9c62d47b7b1f +refs/heads/master: 96f316c24c0aea2984c90170966d9a2cb93d1094 diff --git a/trunk/drivers/hwmon/max6642.c b/trunk/drivers/hwmon/max6642.c index 4298909a41fd..bf236c0782b7 100644 --- a/trunk/drivers/hwmon/max6642.c +++ b/trunk/drivers/hwmon/max6642.c @@ -286,11 +286,10 @@ static int max6642_probe(struct i2c_client *new_client, struct max6642_data *data; int err; - data = kzalloc(sizeof(struct max6642_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&new_client->dev, sizeof(struct max6642_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(new_client, data); mutex_init(&data->update_lock); @@ -301,7 +300,7 @@ static int max6642_probe(struct i2c_client *new_client, /* Register sysfs hooks */ err = sysfs_create_group(&new_client->dev.kobj, &max6642_group); if (err) - goto exit_free; + return err; data->hwmon_dev = hwmon_device_register(&new_client->dev); if (IS_ERR(data->hwmon_dev)) { @@ -313,9 +312,6 @@ static int max6642_probe(struct i2c_client *new_client, exit_remove_files: sysfs_remove_group(&new_client->dev.kobj, &max6642_group); -exit_free: - kfree(data); -exit: return err; } @@ -326,7 +322,6 @@ static int max6642_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &max6642_group); - kfree(data); return 0; }