diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-03-15 05:14:46 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-03-27 11:05:11 -0400 |
commit | c3fe2bf4916e85fabc66690c8784bbce3ef4d2b4 (patch) | |
tree | 6af28e28fe1b17880949fc4c160376ca86c1cb0b | |
parent | 24bb3813d525322e007c47134cd476f04dbb554f (diff) |
gpio: max7300: use devm_kzalloc()
Use devm_kzalloc() to make cleanup paths simpler.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/gpio/gpio-max7300.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpio/gpio-max7300.c b/drivers/gpio/gpio-max7300.c index 4b6b9a04e326..40ab6dfb6021 100644 --- a/drivers/gpio/gpio-max7300.c +++ b/drivers/gpio/gpio-max7300.c | |||
@@ -41,7 +41,7 @@ static int max7300_probe(struct i2c_client *client, | |||
41 | I2C_FUNC_SMBUS_BYTE_DATA)) | 41 | I2C_FUNC_SMBUS_BYTE_DATA)) |
42 | return -EIO; | 42 | return -EIO; |
43 | 43 | ||
44 | ts = kzalloc(sizeof(struct max7301), GFP_KERNEL); | 44 | ts = devm_kzalloc(&client->dev, sizeof(struct max7301), GFP_KERNEL); |
45 | if (!ts) | 45 | if (!ts) |
46 | return -ENOMEM; | 46 | return -ENOMEM; |
47 | 47 | ||
@@ -50,8 +50,6 @@ static int max7300_probe(struct i2c_client *client, | |||
50 | ts->dev = &client->dev; | 50 | ts->dev = &client->dev; |
51 | 51 | ||
52 | ret = __max730x_probe(ts); | 52 | ret = __max730x_probe(ts); |
53 | if (ret) | ||
54 | kfree(ts); | ||
55 | return ret; | 53 | return ret; |
56 | } | 54 | } |
57 | 55 | ||