summary refs log tree commit diff
path: root/drivers/gpio/gpio-max7300.c
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-03-15 18:14:46 +0900
committerLinus Walleij <linus.walleij@linaro.org>2013-03-27 16:05:11 +0100
commitc3fe2bf4916e85fabc66690c8784bbce3ef4d2b4 (patch)
tree6af28e28fe1b17880949fc4c160376ca86c1cb0b /drivers/gpio/gpio-max7300.c
parent24bb3813d525322e007c47134cd476f04dbb554f (diff)
downloadlinux-c3fe2bf4916e85fabc66690c8784bbce3ef4d2b4.tar.gz
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>
Diffstat (limited to 'drivers/gpio/gpio-max7300.c')
-rw-r--r--drivers/gpio/gpio-max7300.c4
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,
 			I2C_FUNC_SMBUS_BYTE_DATA))
 		return -EIO;
 
-	ts = kzalloc(sizeof(struct max7301), GFP_KERNEL);
+	ts = devm_kzalloc(&client->dev, sizeof(struct max7301), GFP_KERNEL);
 	if (!ts)
 		return -ENOMEM;
 
@@ -50,8 +50,6 @@ static int max7300_probe(struct i2c_client *client,
 	ts->dev = &client->dev;
 
 	ret = __max730x_probe(ts);
-	if (ret)
-		kfree(ts);
 	return ret;
 }