From 8e3795929ea525b2c504cc8d75c1573a7511b16c Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Wed, 22 Feb 2012 08:56:48 -0800 Subject: [PATCH] --- yaml --- r: 292223 b: refs/heads/master c: b8a5a7cebded23eb311b8db73a11ed23b4135170 h: refs/heads/master i: 292221: 1740c55e082985ac7d0561700e60c03ce0c76edc 292219: 9e505dfb03e8b8a027255193566baf70d01f593e 292215: ce9518def6eb3d8a791bc54d075c3ba11bd7a57a 292207: 0e0766adea2518df3ada657dd6e0da3cdc094a8f 292191: 76e385e5135128c5ec59b60f00b23104628e07b8 292159: a3012b71a5ab6f0a77109e54e5bdcf322935b51e 292095: a23760d9ad29b1d6875e4cd6d4df29594150cfa2 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/smm665.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 4503fe8b80e2..d3340da7ca2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 36839287204f1c419907d3873f1e45062000e8a2 +refs/heads/master: b8a5a7cebded23eb311b8db73a11ed23b4135170 diff --git a/trunk/drivers/hwmon/smm665.c b/trunk/drivers/hwmon/smm665.c index 5877078aaca5..cbc51fb30dba 100644 --- a/trunk/drivers/hwmon/smm665.c +++ b/trunk/drivers/hwmon/smm665.c @@ -584,10 +584,9 @@ static int smm665_probe(struct i2c_client *client, if (i2c_smbus_read_byte_data(client, SMM665_ADOC_ENABLE) < 0) return -ENODEV; - ret = -ENOMEM; - data = kzalloc(sizeof(*data), GFP_KERNEL); + data = devm_kzalloc(&client->dev, sizeof(*data), GFP_KERNEL); if (!data) - goto out_return; + return -ENOMEM; i2c_set_clientdata(client, data); mutex_init(&data->update_lock); @@ -596,7 +595,7 @@ static int smm665_probe(struct i2c_client *client, data->cmdreg = i2c_new_dummy(adapter, (client->addr & ~SMM665_REGMASK) | SMM665_CMDREG_BASE); if (!data->cmdreg) - goto out_kfree; + return -ENOMEM; switch (data->type) { case smm465: @@ -679,9 +678,6 @@ static int smm665_probe(struct i2c_client *client, sysfs_remove_group(&client->dev.kobj, &smm665_group); out_unregister: i2c_unregister_device(data->cmdreg); -out_kfree: - kfree(data); -out_return: return ret; } @@ -693,8 +689,6 @@ static int smm665_remove(struct i2c_client *client) hwmon_device_unregister(data->hwmon_dev); sysfs_remove_group(&client->dev.kobj, &smm665_group); - kfree(data); - return 0; }