From 71bc4f1de3c5c14e7512c648249494238fd8405e Mon Sep 17 00:00:00 2001 From: Markus Elfring Date: Fri, 9 Mar 2018 09:19:42 +0100 Subject: [PATCH] mfd: tps65910: Move an assignment in tps65910_sleepinit() Move the assignment for the local variable "dev" so that its setting will be performed after a configuration check by this function. Signed-off-by: Markus Elfring Signed-off-by: Lee Jones --- drivers/mfd/tps65910.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c index 7e7d3d1642c6..bf16cbe6fd88 100644 --- a/drivers/mfd/tps65910.c +++ b/drivers/mfd/tps65910.c @@ -315,11 +315,11 @@ static int tps65910_sleepinit(struct tps65910 *tps65910, struct device *dev; int ret; - dev = tps65910->dev; - if (!pmic_pdata->en_dev_slp) return 0; + dev = tps65910->dev; + /* enabling SLEEP device state */ ret = tps65910_reg_set_bits(tps65910, TPS65910_DEVCTRL, DEVCTRL_DEV_SLP_MASK); -- 2.11.0