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

Commit 03ed9a57 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: touchscreen: synaptics_tcm: marker buffer to heap memory"

parents ecb02fd5 ea3c5818

drivers/input/touchscreen/synaptics_tcm/synaptics_tcm_core.c

+2 −3
Original line number Diff line number Diff line
@@ -1603,7 +1603,6 @@ static void syna_tcm_update_watchdog(struct syna_tcm_hcd *tcm_hcd, bool en) 
static void syna_tcm_watchdog_work(struct work_struct *work)

{

	int retval;

	unsigned char marker;

	struct delayed_work *delayed_work =

			container_of(work, struct delayed_work, work);

	struct syna_tcm_watchdog *watchdog =
@@ -1618,12 +1617,12 @@ static void syna_tcm_watchdog_work(struct work_struct *work) 
	mutex_lock(&tcm_hcd->rw_ctrl_mutex);



	retval = syna_tcm_read(tcm_hcd,

			&marker,

			&tcm_hcd->marker,

			1);



	mutex_unlock(&tcm_hcd->rw_ctrl_mutex);



	if (retval < 0 || marker != MESSAGE_MARKER) {

	if (retval < 0 || tcm_hcd->marker != MESSAGE_MARKER) {

		LOGE(tcm_hcd->pdev->dev.parent,

				"Failed to read from device\n");

drivers/input/touchscreen/synaptics_tcm/synaptics_tcm_core.h

+1 −0
Original line number Diff line number Diff line
@@ -394,6 +394,7 @@ struct syna_tcm_hcd { 
	bool in_suspend;

	bool irq_enabled;

	bool host_download_mode;

	unsigned char marker;

	unsigned char fb_ready;

	unsigned char command;

	unsigned char async_report_id;