summaryrefslogtreecommitdiff
path: root/drivers/misc/mei/mei_dev.h
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2015-02-10 08:39:36 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-02 03:36:59 (GMT)
commit3d33ff2457355a9dd3c3178b04ab6669882b306c (patch)
tree692168d2c6df72783349246c879995212d3f7dd3 /drivers/misc/mei/mei_dev.h
parent3908be6f9aa5517bc717f8ffdaaafd89a1b78471 (diff)
downloadlinux-3d33ff2457355a9dd3c3178b04ab6669882b306c.tar.xz
mei: fix device reset on mei_cl_irq_read_msg allocation failure
On memory allocation failure mei_cl_irq_read_msg will return with error that will cause device reset. Instead we should propagate error to caller and just clean the read queues. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/mei_dev.h')
-rw-r--r--drivers/misc/mei/mei_dev.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index 102cc66..195e426 100644
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -199,6 +199,7 @@ struct mei_cl;
* @buf_idx: last read index
* @read_time: last read operation time stamp (iamthif)
* @file_object: pointer to file structure
+ * @status: io status of the cb
* @internal: communication between driver and FW flag
*/
struct mei_cl_cb {
@@ -210,6 +211,7 @@ struct mei_cl_cb {
unsigned long buf_idx;
unsigned long read_time;
struct file *file_object;
+ int status;
u32 internal:1;
};