From b6604ee53805da6d3292fd324a4219dd5d5f643d Mon Sep 17 00:00:00 2001 From: Team Quanta Date: Sat, 23 Jun 2018 21:26:31 +0530 Subject: [PATCH] Fix Derp in TOuch Screen part 2 --- drivers/input/touchscreen/ft5336/ft5x06_720p.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/input/touchscreen/ft5336/ft5x06_720p.c b/drivers/input/touchscreen/ft5336/ft5x06_720p.c index 1d6556e71dfd..844e715873c5 100644 --- a/drivers/input/touchscreen/ft5336/ft5x06_720p.c +++ b/drivers/input/touchscreen/ft5336/ft5x06_720p.c @@ -755,13 +755,7 @@ static int fb_notifier_callback(struct notifier_block *self, if (evdata && evdata->data && event == FB_EVENT_BLANK && ft5x06_data && ft5x06_data->client) { blank = evdata->data; -<<<<<<< HEAD - if (*blank == FB_BLANK_UNBLANK - || *blank == FB_BLANK_NORMAL - || *blank == FB_BLANK_VSYNC_SUSPEND) -======= if (*blank == FB_BLANK_UNBLANK) ->>>>>>> af5788f... drivers: input: Import Xiaomi ft5336 touchscreen & gen_vkeys drivers schedule_work(&ft5x06_data->fb_notify_work); else if (*blank == FB_BLANK_POWERDOWN) { flush_work(&ft5x06_data->fb_notify_work);