Merge "input: touchpanel: fix wastes of time when resume and probe for ST's TP" (607bbf6f) · Commits · e / devices / android_kernel_sony_msm8998

drivers/input/touchscreen/st/fts.c

+13 −6

Original line number	Diff line number	Diff line
		@@ -1003,7 +1003,10 @@ static unsigned char *fts_status_event_handler(
		case FTS_WATER_MODE_ON:
		case FTS_WATER_MODE_OFF:
		default:
		logError(1, "%s %s Received unhandled status event = %02X %02X %02X %02X %02X %02X %02X %02X\n", tag, __func__, event[0], event[1], event[2], event[3], event[4], event[5], event[6], event[7]);
		logError(0,
		"%s %s Received unhandled status event = %02X %02X %02X %02X %02X %02X %02X %02X\n",
		tag, __func__, event[0], event[1], event[2],
		event[3], event[4], event[5], event[6], event[7]);
		break;
		}

		@@ -1755,8 +1758,6 @@ static int fts_fb_state_chg_callback(struct notifier_block *nb, unsigned long va

		info->resume_bit = 1;

		fts_system_reset();

		fts_mode_handler(info, 0);

		info->sensor_sleep = false;
		@@ -2210,7 +2211,13 @@ static int fts_probe(struct i2c_client *client,
		}

		#endif
		queue_delayed_work(info->fwu_workqueue, &info->fwu_work, msecs_to_jiffies(EXP_FN_WORK_DELAY_MS));
		/*if wanna auto-update FW when probe,
		* please don't comment the following code
		*/

		/* queue_delayed_work(info->fwu_workqueue, &info->fwu_work,
		* msecs_to_jiffies(EXP_FN_WORK_DELAY_MS));
		*/
		logError(1, "%s Probe Finished!\n", tag);
		return OK;