Commit 41d7d26b authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Dmitry Torokhov

Input: adp5589-keys - use devm_kzalloc() to allocate the kpad object

This removes the need to manually free the kpad object and cleans up some
exit/error paths.  The error path cleanup should reduce the risk of any
memory leaks with this object.
Signed-off-by: default avatarAlexandru Ardelean <alexandru.ardelean@analog.com>
Link: https://lore.kernel.org/r/20201112074308.71351-2-alexandru.ardelean@analog.comSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent c6c74650
...@@ -1007,7 +1007,7 @@ static int adp5589_probe(struct i2c_client *client, ...@@ -1007,7 +1007,7 @@ static int adp5589_probe(struct i2c_client *client,
return -EINVAL; return -EINVAL;
} }
kpad = kzalloc(sizeof(*kpad), GFP_KERNEL); kpad = devm_kzalloc(&client->dev, sizeof(*kpad), GFP_KERNEL);
if (!kpad) if (!kpad)
return -ENOMEM; return -ENOMEM;
...@@ -1028,17 +1028,15 @@ static int adp5589_probe(struct i2c_client *client, ...@@ -1028,17 +1028,15 @@ static int adp5589_probe(struct i2c_client *client,
} }
ret = adp5589_read(client, ADP5589_5_ID); ret = adp5589_read(client, ADP5589_5_ID);
if (ret < 0) { if (ret < 0)
error = ret; return ret;
goto err_free_mem;
}
revid = (u8) ret & ADP5589_5_DEVICE_ID_MASK; revid = (u8) ret & ADP5589_5_DEVICE_ID_MASK;
if (pdata->keymapsize) { if (pdata->keymapsize) {
error = adp5589_keypad_add(kpad, revid); error = adp5589_keypad_add(kpad, revid);
if (error) if (error)
goto err_free_mem; return error;
} }
error = adp5589_setup(kpad); error = adp5589_setup(kpad);
...@@ -1059,8 +1057,6 @@ static int adp5589_probe(struct i2c_client *client, ...@@ -1059,8 +1057,6 @@ static int adp5589_probe(struct i2c_client *client,
err_keypad_remove: err_keypad_remove:
adp5589_keypad_remove(kpad); adp5589_keypad_remove(kpad);
err_free_mem:
kfree(kpad);
return error; return error;
} }
...@@ -1072,7 +1068,6 @@ static int adp5589_remove(struct i2c_client *client) ...@@ -1072,7 +1068,6 @@ static int adp5589_remove(struct i2c_client *client)
adp5589_write(client, kpad->var->reg(ADP5589_GENERAL_CFG), 0); adp5589_write(client, kpad->var->reg(ADP5589_GENERAL_CFG), 0);
adp5589_keypad_remove(kpad); adp5589_keypad_remove(kpad);
adp5589_gpio_remove(kpad); adp5589_gpio_remove(kpad);
kfree(kpad);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment