commit e58bbcf85822e70a43a77d39f526db8e5e3adc43
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jun 16 15:33:57 2018 +0000
committer Android Partner Code Review <android-gerrit-partner@google.com> Sat Jun 16 15:33:57 2018 +0000
tree ab1b6f4edbbad3bb19382b7252d5830e17ff793b
parent eb64a17d471988757dc10d2df7e0872573d86cd4
parent ffac60f6bc5469e541723c99e6ec6278459bb15b

Merge "nfc: nq-nci: remove WAKEUP_SRC_TIMEOUT" into android-msm-firefish-3.18

drivers/nfc/nq-nci.c

diff --git a/drivers/nfc/nq-nci.c b/drivers/nfc/nq-nci.c
index e276533..b2268ff 100644
--- a/drivers/nfc/nq-nci.c
+++ b/drivers/nfc/nq-nci.c
@@ -50,7 +50,6 @@
 MODULE_DEVICE_TABLE(of, msm_match_table);
 
 #define MAX_BUFFER_SIZE			(320)
-#define WAKEUP_SRC_TIMEOUT		(2000)
 
 struct nqx_dev {
 	wait_queue_head_t	read_wq;
@@ -139,9 +138,6 @@
 	struct nqx_dev *nqx_dev = dev_id;
 	unsigned long flags;
 
-	if (device_may_wakeup(&nqx_dev->client->dev))
-		pm_wakeup_event(&nqx_dev->client->dev, WAKEUP_SRC_TIMEOUT);
-
 	nqx_disable_irq(nqx_dev);
 	spin_lock_irqsave(&nqx_dev->irq_enabled_lock, flags);
 	nqx_dev->count_irq++;