From 75152c3e0cd0469c2005f69215933d800a3b1d29 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 09:58:12 -0700 Subject: [PATCH] --- yaml --- r: 326175 b: refs/heads/master c: 7008b9704ada3d7483358da7a3c7c640e1e0be17 h: refs/heads/master i: 326173: 200e691484db08c3d3b0b9ab14e8e465a5cf3145 326171: 1f9b9e4cb98a29edea8b89f34dbe49c12ce97d27 326167: 925b012a96fd242b97510fc9fa22020bf8c5f80b 326159: 62891ce5c94e6780d14ac58ea3a90fa3c19bb8c5 326143: 789f8720fc74c8e8d7bf101a5578e7b3b25b336c v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/max1668.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a5af47cf8d6b..3c9afb229cf9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8dd946c420781fd7a70fec8b75e0daf67c4a681 +refs/heads/master: 7008b9704ada3d7483358da7a3c7c640e1e0be17 diff --git a/trunk/drivers/hwmon/max1668.c b/trunk/drivers/hwmon/max1668.c index 335b183d7c02..666d9f6263eb 100644 --- a/trunk/drivers/hwmon/max1668.c +++ b/trunk/drivers/hwmon/max1668.c @@ -411,7 +411,8 @@ static int max1668_probe(struct i2c_client *client, if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) return -ENODEV; - data = kzalloc(sizeof(struct max1668_data), GFP_KERNEL); + data = devm_kzalloc(&client->dev, sizeof(struct max1668_data), + GFP_KERNEL); if (!data) return -ENOMEM; @@ -422,7 +423,7 @@ static int max1668_probe(struct i2c_client *client, /* Register sysfs hooks */ err = sysfs_create_group(&client->dev.kobj, &max1668_group_common); if (err) - goto error_free; + return err; if (data->type == max1668 || data->type == max1989) { err = sysfs_create_group(&client->dev.kobj, @@ -444,8 +445,6 @@ static int max1668_probe(struct i2c_client *client, sysfs_remove_group(&client->dev.kobj, &max1668_group_unique); error_sysrem0: sysfs_remove_group(&client->dev.kobj, &max1668_group_common); -error_free: - kfree(data); return err; } @@ -459,7 +458,6 @@ static int max1668_remove(struct i2c_client *client) sysfs_remove_group(&client->dev.kobj, &max1668_group_common); - kfree(data); return 0; }