From 0fd390918450d88b8393240469674c85cf32f42a Mon Sep 17 00:00:00 2001
From: Tomas Winkler <tomas.winkler@intel.com>
Date: Sun, 11 Nov 2012 17:38:02 +0200
Subject: [PATCH] --- yaml --- r: 336964 b: refs/heads/master c:
 744f0f2f424d374b233cea5f9b34caa851543755 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/misc/mei/amthif.c  | 19 +++++++++++++++++++
 trunk/drivers/misc/mei/main.c    | 10 +---------
 trunk/drivers/misc/mei/mei_dev.h |  6 +++++-
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 5072794f33f9..7d5bd8d561fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a562d5c25aa48c23774ab8d60bfd3bbcbca4bf1d
+refs/heads/master: 744f0f2f424d374b233cea5f9b34caa851543755
diff --git a/trunk/drivers/misc/mei/amthif.c b/trunk/drivers/misc/mei/amthif.c
index 8f4373aa9e24..7416241dce88 100644
--- a/trunk/drivers/misc/mei/amthif.c
+++ b/trunk/drivers/misc/mei/amthif.c
@@ -401,6 +401,25 @@ void mei_amthif_run_next_cmd(struct mei_device *dev)
 	}
 }
 
+
+unsigned int mei_amthif_poll(struct mei_device *dev,
+		struct file *file, poll_table *wait)
+{
+	unsigned int mask = 0;
+	mutex_unlock(&dev->device_lock);
+	poll_wait(file, &dev->iamthif_cl.wait, wait);
+	mutex_lock(&dev->device_lock);
+	if (dev->iamthif_state == MEI_IAMTHIF_READ_COMPLETE &&
+		dev->iamthif_file_object == file) {
+		mask |= (POLLIN | POLLRDNORM);
+		dev_dbg(&dev->pdev->dev, "run next amthi cb\n");
+		mei_amthif_run_next_cmd(dev);
+	}
+	return mask;
+}
+
+
+
 /**
  * mei_amthif_irq_process_completed - processes completed iamthif operation.
  *
diff --git a/trunk/drivers/misc/mei/main.c b/trunk/drivers/misc/mei/main.c
index 43512e517952..2cc1ebb131ba 100644
--- a/trunk/drivers/misc/mei/main.c
+++ b/trunk/drivers/misc/mei/main.c
@@ -694,15 +694,7 @@ static unsigned int mei_poll(struct file *file, poll_table *wait)
 
 
 	if (cl == &dev->iamthif_cl) {
-		mutex_unlock(&dev->device_lock);
-		poll_wait(file, &dev->iamthif_cl.wait, wait);
-		mutex_lock(&dev->device_lock);
-		if (dev->iamthif_state == MEI_IAMTHIF_READ_COMPLETE &&
-			dev->iamthif_file_object == file) {
-			mask |= (POLLIN | POLLRDNORM);
-			dev_dbg(&dev->pdev->dev, "run next amthi cb\n");
-			mei_amthif_run_next_cmd(dev);
-		}
+		mask = mei_amthif_poll(dev, file, wait);
 		goto out;
 	}
 
diff --git a/trunk/drivers/misc/mei/mei_dev.h b/trunk/drivers/misc/mei/mei_dev.h
index bdad35e7aa54..dad85f3fe390 100644
--- a/trunk/drivers/misc/mei/mei_dev.h
+++ b/trunk/drivers/misc/mei/mei_dev.h
@@ -19,6 +19,7 @@
 
 #include <linux/types.h>
 #include <linux/watchdog.h>
+#include <linux/poll.h>
 #include <linux/mei.h>
 #include "hw.h"
 
@@ -387,7 +388,10 @@ void mei_amthif_host_init(struct mei_device *dev);
 int mei_amthif_write(struct mei_device *dev, struct mei_cl_cb *priv_cb);
 
 int mei_amthif_read(struct mei_device *dev, struct file *file,
-	      char __user *ubuf, size_t length, loff_t *offset);
+		char __user *ubuf, size_t length, loff_t *offset);
+
+unsigned int mei_amthif_poll(struct mei_device *dev,
+		struct file *file, poll_table *wait);
 
 int mei_amthif_release(struct mei_device *dev, struct file *file);