From 733c493dafd4799f1a950d0387e9f6e4a9311043 Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Sat, 2 Jun 2012 11:35:52 -0700 Subject: [PATCH] --- yaml --- r: 316007 b: refs/heads/master c: f511a21f4ea7d4410241e15db5cb05a287812582 h: refs/heads/master i: 316005: f82a53444744ba9aa8bb251c927dfa1e903a2810 316003: dd0d1996066dbce99b2ba0679b5ef69a89a3886a 315999: ed14daf539225b89bd140709ab6a57413b404433 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/tmp102.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 183c7efeb832..a11a5b13cb97 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd91d3bab8787f53c1b937ac817b0c59f8146b97 +refs/heads/master: f511a21f4ea7d4410241e15db5cb05a287812582 diff --git a/trunk/drivers/hwmon/tmp102.c b/trunk/drivers/hwmon/tmp102.c index 0d466b9d8908..4e1ff82c63e0 100644 --- a/trunk/drivers/hwmon/tmp102.c +++ b/trunk/drivers/hwmon/tmp102.c @@ -159,17 +159,16 @@ static int __devinit tmp102_probe(struct i2c_client *client, return -ENODEV; } - tmp102 = kzalloc(sizeof(*tmp102), GFP_KERNEL); - if (!tmp102) { - dev_dbg(&client->dev, "kzalloc failed\n"); + tmp102 = devm_kzalloc(&client->dev, sizeof(*tmp102), GFP_KERNEL); + if (!tmp102) return -ENOMEM; - } + i2c_set_clientdata(client, tmp102); status = i2c_smbus_read_word_swapped(client, TMP102_CONF_REG); if (status < 0) { dev_err(&client->dev, "error reading config register\n"); - goto fail_free; + return status; } tmp102->config_orig = status; status = i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, @@ -213,9 +212,6 @@ static int __devinit tmp102_probe(struct i2c_client *client, fail_restore_config: i2c_smbus_write_word_swapped(client, TMP102_CONF_REG, tmp102->config_orig); -fail_free: - kfree(tmp102); - return status; } @@ -236,8 +232,6 @@ static int __devexit tmp102_remove(struct i2c_client *client) config | TMP102_CONF_SD); } - kfree(tmp102); - return 0; }