From 70b48aa7967bce31985ba67eb9134614b257a47f Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 09:58:04 -0700 Subject: [PATCH] --- yaml --- r: 315985 b: refs/heads/master c: 6ecffe16911dc79b079b6fb4491fd157c62d4371 h: refs/heads/master i: 315983: 8a7f1461e9230be80571ad8ef157e7510e5a0b81 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/emc6w201.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 53ca4a1b0845..a86a35d65aa0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e20b4b38cdf1622d1577ae5e402ded2bd63bf616 +refs/heads/master: 6ecffe16911dc79b079b6fb4491fd157c62d4371 diff --git a/trunk/drivers/hwmon/emc6w201.c b/trunk/drivers/hwmon/emc6w201.c index 840f5112e602..ada12a98a97c 100644 --- a/trunk/drivers/hwmon/emc6w201.c +++ b/trunk/drivers/hwmon/emc6w201.c @@ -492,11 +492,10 @@ static int emc6w201_probe(struct i2c_client *client, struct emc6w201_data *data; int err; - data = kzalloc(sizeof(struct emc6w201_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto exit; - } + data = devm_kzalloc(&client->dev, sizeof(struct emc6w201_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); mutex_init(&data->update_lock); @@ -504,7 +503,7 @@ static int emc6w201_probe(struct i2c_client *client, /* Create sysfs attribute */ err = sysfs_create_group(&client->dev.kobj, &emc6w201_group); if (err) - goto exit_free; + return err; /* Expose as a hwmon device */ data->hwmon_dev = hwmon_device_register(&client->dev); @@ -517,9 +516,6 @@ static int emc6w201_probe(struct i2c_client *client, exit_remove: sysfs_remove_group(&client->dev.kobj, &emc6w201_group); - exit_free: - kfree(data); - exit: return err; } @@ -529,7 +525,6 @@ static int emc6w201_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &emc6w201_group); - kfree(data); return 0; }