A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

input: synaptics_mmi: avoid put for regulators

Browse source 
Regulators requested with devm_regulator_get, regulator_put is done
automatically as part of resources release procedure.

Change-Id: I8940ca3adf5a3953b58d313edd95cc8a264bd37a
Signed-off-by: Konstantin Makariev <hcv867@motorola.com>
Reviewed-on: https://gerrit.mot.com/1116100
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Konstantin Makariev <kmakariev@motorola.com>
Submit-Approved: Jira Key
This commit is contained in:
Konstantin Makariev 2018-01-10 16:29:06 -06:00 • committed by Konstantin Makariev
commit b29e74c8c1
1 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c
View file

@ -7237,7 +7237,6 @@ static int synaptics_rmi4_probe(struct i2c_client *client,
if (!IS_ERR(rmi4_data->vdd_quirk)) {
retval = regulator_enable(rmi4_data->vdd_quirk);
if (retval) {
regulator_put(rmi4_data->vdd_quirk);
dev_err(&client->dev, "Failed to enable vdd-quirk\n");
goto err_vdd_quirk;
}
@ -7395,16 +7394,12 @@ err_sysfs:
#endif
err_query_device:
if (!IS_ERR(rmi4_data->vdd_quirk)) {
if (!IS_ERR(rmi4_data->vdd_quirk))
regulator_disable(rmi4_data->vdd_quirk);
regulator_put(rmi4_data->vdd_quirk);
}
err_vdd_quirk:
if (platform_data->regulator_en) {
if (platform_data->regulator_en)
regulator_disable(rmi4_data->regulator);
regulator_put(rmi4_data->regulator);
}
err_touch_vdd:
synaptics_rmi4_cleanup(rmi4_data);
@ -7466,15 +7461,11 @@ static int synaptics_rmi4_remove(struct i2c_client *client)
else
input_free_device(rmi4_data->input_dev);
if (!IS_ERR(rmi4_data->vdd_quirk)) {
if (!IS_ERR(rmi4_data->vdd_quirk))
regulator_disable(rmi4_data->vdd_quirk);
regulator_put(rmi4_data->vdd_quirk);
}
if (rmi4_data->board->regulator_en) {
if (rmi4_data->board->regulator_en)
regulator_disable(rmi4_data->regulator);
regulator_put(rmi4_data->regulator);
}
#if defined(CONFIG_MMI_PANEL_NOTIFICATIONS)
mmi_panel_unregister_notifier(&rmi4_data->panel_nb);