From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Hans de Goede <hdegoede@redhat.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Subject: [PATCH 4.9 28/32] Input: elan_i2c - move regulator_[en|dis]able() out of elan_[en|dis]able_power()
Date: Mon, 7 Mar 2022 10:18:54 +0100 [thread overview]
Message-ID: <20220307091635.237206483@linuxfoundation.org> (raw)
In-Reply-To: <20220307091634.434478485@linuxfoundation.org>
From: Hans de Goede <hdegoede@redhat.com>
commit 81a36d8ce554b82b0a08e2b95d0bd44fcbff339b upstream.
elan_disable_power() is called conditionally on suspend, where as
elan_enable_power() is always called on resume. This leads to
an imbalance in the regulator's enable count.
Move the regulator_[en|dis]able() calls out of elan_[en|dis]able_power()
in preparation of fixing this.
No functional changes intended.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220131135436.29638-1-hdegoede@redhat.com
[dtor: consolidate elan_[en|dis]able() into elan_set_power()]
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/input/mouse/elan_i2c_core.c | 62 ++++++++++++------------------------
1 file changed, 22 insertions(+), 40 deletions(-)
--- a/drivers/input/mouse/elan_i2c_core.c
+++ b/drivers/input/mouse/elan_i2c_core.c
@@ -132,55 +132,21 @@ static int elan_get_fwinfo(u8 iap_versio
return 0;
}
-static int elan_enable_power(struct elan_tp_data *data)
+static int elan_set_power(struct elan_tp_data *data, bool on)
{
int repeat = ETP_RETRY_COUNT;
int error;
- error = regulator_enable(data->vcc);
- if (error) {
- dev_err(&data->client->dev,
- "failed to enable regulator: %d\n", error);
- return error;
- }
-
do {
- error = data->ops->power_control(data->client, true);
+ error = data->ops->power_control(data->client, on);
if (error >= 0)
return 0;
msleep(30);
} while (--repeat > 0);
- dev_err(&data->client->dev, "failed to enable power: %d\n", error);
- return error;
-}
-
-static int elan_disable_power(struct elan_tp_data *data)
-{
- int repeat = ETP_RETRY_COUNT;
- int error;
-
- do {
- error = data->ops->power_control(data->client, false);
- if (!error) {
- error = regulator_disable(data->vcc);
- if (error) {
- dev_err(&data->client->dev,
- "failed to disable regulator: %d\n",
- error);
- /* Attempt to power the chip back up */
- data->ops->power_control(data->client, true);
- break;
- }
-
- return 0;
- }
-
- msleep(30);
- } while (--repeat > 0);
-
- dev_err(&data->client->dev, "failed to disable power: %d\n", error);
+ dev_err(&data->client->dev, "failed to set power %s: %d\n",
+ on ? "on" : "off", error);
return error;
}
@@ -1195,9 +1161,19 @@ static int __maybe_unused elan_suspend(s
/* Enable wake from IRQ */
data->irq_wake = (enable_irq_wake(client->irq) == 0);
} else {
- ret = elan_disable_power(data);
+ ret = elan_set_power(data, false);
+ if (ret)
+ goto err;
+
+ ret = regulator_disable(data->vcc);
+ if (ret) {
+ dev_err(dev, "error %d disabling regulator\n", ret);
+ /* Attempt to power the chip back up */
+ elan_set_power(data, true);
+ }
}
+err:
mutex_unlock(&data->sysfs_mutex);
return ret;
}
@@ -1213,7 +1189,13 @@ static int __maybe_unused elan_resume(st
data->irq_wake = false;
}
- error = elan_enable_power(data);
+ error = regulator_enable(data->vcc);
+ if (error) {
+ dev_err(dev, "error %d enabling regulator\n", error);
+ goto err;
+ }
+
+ error = elan_set_power(data, true);
if (error) {
dev_err(dev, "power up when resuming failed: %d\n", error);
goto err;
next prev parent reply other threads:[~2022-03-07 9:21 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-07 9:18 [PATCH 4.9 00/32] 4.9.305-rc1 review Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 01/32] mac80211_hwsim: report NOACK frames in tx_status Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 02/32] mac80211_hwsim: initialize ieee80211_tx_info at hw_scan_work Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 03/32] i2c: bcm2835: Avoid clock stretching timeouts Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 04/32] Input: clear BTN_RIGHT/MIDDLE on buttonpads Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 05/32] cifs: fix double free race when mount fails in cifs_get_root() Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 06/32] dmaengine: shdma: Fix runtime PM imbalance on error Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 07/32] i2c: qup: allow COMPILE_TEST Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 08/32] net: usb: cdc_mbim: avoid altsetting toggling for Telit FN990 Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 09/32] usb: gadget: dont release an existing dev->buf Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 10/32] usb: gadget: clear related members when goto fail Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 11/32] ata: pata_hpt37x: fix PCI clock detection Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 12/32] ASoC: ops: Shift tested values in snd_soc_put_volsw() by +min Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 13/32] xfrm: fix MTU regression Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 14/32] netfilter: nf_queue: dont assume sk is full socket Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 15/32] netfilter: nf_queue: fix possible use-after-free Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 16/32] net: dcb: flush lingering app table entries for unregistered devices Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 17/32] firmware: Fix a reference count leak Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 18/32] firmware: qemu_fw_cfg: fix kobject leak in probe error path Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 19/32] mac80211: fix forwarded mesh frames AC & queue selection Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 20/32] net: stmmac: fix return value of __setup handler Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 21/32] net: sxgbe: " Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 22/32] net: arcnet: com20020: Fix null-ptr-deref in com20020pci_probe() Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 23/32] efivars: Respect "block" flag in efivar_entry_set_safe() Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 24/32] can: gs_usb: change active_channelss type from atomic_t to u8 Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 25/32] ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 26/32] soc: fsl: qe: Check of ioremap return value Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 27/32] net: chelsio: cxgb3: check the return value of pci_find_capability() Greg Kroah-Hartman
2022-03-07 9:18 ` Greg Kroah-Hartman [this message]
2022-03-07 9:18 ` [PATCH 4.9 29/32] Input: elan_i2c - fix regulator enable count imbalance after suspend/resume Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 30/32] HID: add mapping for KEY_ALL_APPLICATIONS Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 31/32] memfd: fix F_SEAL_WRITE after shmem huge page allocated Greg Kroah-Hartman
2022-03-07 9:18 ` [PATCH 4.9 32/32] net: dcb: disable softirqs in dcbnl_flush_dev() Greg Kroah-Hartman
2022-03-07 18:19 ` [PATCH 4.9 00/32] 4.9.305-rc1 review Florian Fainelli
2022-03-07 23:46 ` Shuah Khan
2022-03-08 15:57 ` Naresh Kamboju
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220307091635.237206483@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=dmitry.torokhov@gmail.com \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).