From 282414bc7f9ab473386eda1dac2b2933771e4c6e Mon Sep 17 00:00:00 2001 From: Konstantin Makariev Date: Thu, 16 Aug 2018 15:09:44 -0500 Subject: [PATCH] fixup! (CR) synaptics_mmi: support splash screen mode Mot-CRs-Fixed: (CR) Signed-off-by: Konstantin Makariev Change-Id: Ib485c60e2e4f85fcb4873c2866127d0d581c6b06 Reviewed-on: https://gerrit.mot.com/1228687 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Konstantin Makariev Submit-Approved: Jira Key --- .../input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c index d6e16677360e..c3856a44ec62 100644 --- a/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c +++ b/drivers/input/touchscreen/synaptics_mmi/synaptics_dsx_i2c.c @@ -7417,8 +7417,12 @@ err_sysfs: #endif err_query_device: - if (!IS_ERR(rmi4_data->vdd_quirk)) - regulator_disable(rmi4_data->vdd_quirk); + if (!IS_ERR(rmi4_data->vdd_quirk)) { + if (rmi4_data->splash_screen_mode) + dev_warn(&client->dev, "leaving vdd_quirk enabled\n"); + else + regulator_disable(rmi4_data->vdd_quirk); + } err_vdd_quirk: if (platform_data->regulator_en)