Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 420a6267 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "input: touchscreen: st: turn off regulator during suspend""

parents 9d6f46d5 9a6ec5ec

drivers/input/touchscreen/st/fts.c

+0 −8
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ static int fts_init_afterProbe(struct fts_ts_info *info); 
static int fts_mode_handler(struct fts_ts_info *info, int force);

static int fts_command(struct fts_ts_info *info, unsigned char cmd);

static int fts_chip_initialization(struct fts_ts_info *info);

static int fts_enable_reg(struct fts_ts_info *info, bool enable);



active_tp_setup(st);
@@ -4018,11 +4017,6 @@ static void fts_resume_work(struct work_struct *work) 


	__pm_wakeup_event(&info->wakeup_source, HZ);



	if (fts_enable_reg(info, true) < 0) {

		logError(1, "%s %s: ERROR Failed to enable regulators\n",

			tag, __func__);

	}



	if (info->ts_pinctrl) {

		/*

		 * Pinctrl handle is optional. If pinctrl handle is found
@@ -4085,8 +4079,6 @@ static void fts_suspend_work(struct work_struct *work) 
				__func__, PINCTRL_STATE_SUSPEND);

		}

	}



	fts_enable_reg(info, false);

}