From 94f7bc78046fa00af1b902fcab27f1f1900ba8b3 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 10:35:52 -0700 Subject: [PATCH] --- yaml --- r: 326178 b: refs/heads/master c: effb8ab114f7ed574f3c033dac642cd2c4ae0021 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/ltc4245.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 60309315a269..8d42e5adc144 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2b95e58ea28eedc126ce9b714e2c7620869fdf4 +refs/heads/master: effb8ab114f7ed574f3c033dac642cd2c4ae0021 diff --git a/trunk/drivers/hwmon/ltc4245.c b/trunk/drivers/hwmon/ltc4245.c index b99b45bafdad..52075914eb0b 100644 --- a/trunk/drivers/hwmon/ltc4245.c +++ b/trunk/drivers/hwmon/ltc4245.c @@ -519,11 +519,9 @@ static int ltc4245_probe(struct i2c_client *client, if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) return -ENODEV; - data = kzalloc(sizeof(*data), GFP_KERNEL); - if (!data) { - ret = -ENOMEM; - goto out_kzalloc; - } + data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); mutex_init(&data->update_lock); @@ -536,7 +534,7 @@ static int ltc4245_probe(struct i2c_client *client, /* Register sysfs hooks */ ret = ltc4245_sysfs_create_groups(client); if (ret) - goto out_sysfs_create_groups; + return ret; data->hwmon_dev = hwmon_device_register(&client->dev); if (IS_ERR(data->hwmon_dev)) { @@ -548,9 +546,6 @@ static int ltc4245_probe(struct i2c_client *client, out_hwmon_device_register: ltc4245_sysfs_remove_groups(client); -out_sysfs_create_groups: - kfree(data); -out_kzalloc: return ret; } @@ -560,7 +555,6 @@ static int ltc4245_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); ltc4245_sysfs_remove_groups(client); - kfree(data); return 0; }