From: Dmitry Torokhov Date: Sat, 13 Jul 2019 08:18:14 +0000 (-0700) Subject: Input: elan_i2c - switch to using devm_add_action_or_reset() X-Git-Tag: v5.4-rc1~109^2^2~39 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=2e75cfaa32c113568994eda716a0bdddc92b376e;p=sfrench%2Fcifs-2.6.git Input: elan_i2c - switch to using devm_add_action_or_reset() Instead of manually disabling regulators when devm_add_action() fails we can use devm_add_action_or_reset() which does it for us. Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c index b549d032da93..8719da540383 100644 --- a/drivers/input/mouse/elan_i2c_core.c +++ b/drivers/input/mouse/elan_i2c_core.c @@ -1187,9 +1187,8 @@ static int elan_probe(struct i2c_client *client, return error; } - error = devm_add_action(dev, elan_disable_regulator, data); + error = devm_add_action_or_reset(dev, elan_disable_regulator, data); if (error) { - regulator_disable(data->vcc); dev_err(dev, "Failed to add disable regulator action: %d\n", error); return error;