Skip to content

Commit 81a36d8

Browse files
jwrdegoededtor
authored andcommitted
Input: elan_i2c - move regulator_[en|dis]able() out of elan_[en|dis]able_power()
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>
1 parent d982992 commit 81a36d8

File tree

1 file changed

+22
-40
lines changed

1 file changed

+22
-40
lines changed

drivers/input/mouse/elan_i2c_core.c

Lines changed: 22 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -186,55 +186,21 @@ static int elan_get_fwinfo(u16 ic_type, u8 iap_version, u16 *validpage_count,
186186
return 0;
187187
}
188188

189-
static int elan_enable_power(struct elan_tp_data *data)
189+
static int elan_set_power(struct elan_tp_data *data, bool on)
190190
{
191191
int repeat = ETP_RETRY_COUNT;
192192
int error;
193193

194-
error = regulator_enable(data->vcc);
195-
if (error) {
196-
dev_err(&data->client->dev,
197-
"failed to enable regulator: %d\n", error);
198-
return error;
199-
}
200-
201194
do {
202-
error = data->ops->power_control(data->client, true);
195+
error = data->ops->power_control(data->client, on);
203196
if (error >= 0)
204197
return 0;
205198

206199
msleep(30);
207200
} while (--repeat > 0);
208201

209-
dev_err(&data->client->dev, "failed to enable power: %d\n", error);
210-
return error;
211-
}
212-
213-
static int elan_disable_power(struct elan_tp_data *data)
214-
{
215-
int repeat = ETP_RETRY_COUNT;
216-
int error;
217-
218-
do {
219-
error = data->ops->power_control(data->client, false);
220-
if (!error) {
221-
error = regulator_disable(data->vcc);
222-
if (error) {
223-
dev_err(&data->client->dev,
224-
"failed to disable regulator: %d\n",
225-
error);
226-
/* Attempt to power the chip back up */
227-
data->ops->power_control(data->client, true);
228-
break;
229-
}
230-
231-
return 0;
232-
}
233-
234-
msleep(30);
235-
} while (--repeat > 0);
236-
237-
dev_err(&data->client->dev, "failed to disable power: %d\n", error);
202+
dev_err(&data->client->dev, "failed to set power %s: %d\n",
203+
on ? "on" : "off", error);
238204
return error;
239205
}
240206

@@ -1399,9 +1365,19 @@ static int __maybe_unused elan_suspend(struct device *dev)
13991365
/* Enable wake from IRQ */
14001366
data->irq_wake = (enable_irq_wake(client->irq) == 0);
14011367
} else {
1402-
ret = elan_disable_power(data);
1368+
ret = elan_set_power(data, false);
1369+
if (ret)
1370+
goto err;
1371+
1372+
ret = regulator_disable(data->vcc);
1373+
if (ret) {
1374+
dev_err(dev, "error %d disabling regulator\n", ret);
1375+
/* Attempt to power the chip back up */
1376+
elan_set_power(data, true);
1377+
}
14031378
}
14041379

1380+
err:
14051381
mutex_unlock(&data->sysfs_mutex);
14061382
return ret;
14071383
}
@@ -1417,7 +1393,13 @@ static int __maybe_unused elan_resume(struct device *dev)
14171393
data->irq_wake = false;
14181394
}
14191395

1420-
error = elan_enable_power(data);
1396+
error = regulator_enable(data->vcc);
1397+
if (error) {
1398+
dev_err(dev, "error %d enabling regulator\n", error);
1399+
goto err;
1400+
}
1401+
1402+
error = elan_set_power(data, true);
14211403
if (error) {
14221404
dev_err(dev, "power up when resuming failed: %d\n", error);
14231405
goto err;

0 commit comments

Comments
 (0)