From f91c0d3d0a9ab4ddcf3f2df0dd929f2604081d8a Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 11:52:24 -0700 Subject: [PATCH] --- yaml --- r: 316015 b: refs/heads/master c: 6e13bb06f62f11797ceb5f28c392f703dc0aa548 h: refs/heads/master i: 316013: dd50366f4327aea60fd35b6d7e575c2fc4f88e12 316011: 40906865240986e2f1d0e046fda2b2638523fc4e 316007: 733c493dafd4799f1a950d0387e9f6e4a9311043 315999: ed14daf539225b89bd140709ab6a57413b404433 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/w83791d.c | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 1396285bc24a..5609d5d167b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 140849e105fd0aadab035923f4cb454ce0518887 +refs/heads/master: 6e13bb06f62f11797ceb5f28c392f703dc0aa548 diff --git a/trunk/drivers/hwmon/w83791d.c b/trunk/drivers/hwmon/w83791d.c index 2f446f92acf2..9ade4d4e2185 100644 --- a/trunk/drivers/hwmon/w83791d.c +++ b/trunk/drivers/hwmon/w83791d.c @@ -1384,18 +1384,17 @@ static int w83791d_probe(struct i2c_client *client, (val1 >> 5) & 0x07, (val1 >> 1) & 0x0f, val1); #endif - data = kzalloc(sizeof(struct w83791d_data), GFP_KERNEL); - if (!data) { - err = -ENOMEM; - goto error0; - } + data = devm_kzalloc(&client->dev, sizeof(struct w83791d_data), + GFP_KERNEL); + if (!data) + return -ENOMEM; i2c_set_clientdata(client, data); mutex_init(&data->update_lock); err = w83791d_detect_subclients(client); if (err) - goto error1; + return err; /* Initialize the chip */ w83791d_init_client(client); @@ -1440,9 +1439,6 @@ static int w83791d_probe(struct i2c_client *client, i2c_unregister_device(data->lm75[0]); if (data->lm75[1] != NULL) i2c_unregister_device(data->lm75[1]); -error1: - kfree(data); -error0: return err; } @@ -1458,7 +1454,6 @@ static int w83791d_remove(struct i2c_client *client) if (data->lm75[1] != NULL) i2c_unregister_device(data->lm75[1]); - kfree(data); return 0; }